From 23e4f03858e41054556912045eab54e79929bff5 Mon Sep 17 00:00:00 2001 From: e7d Date: Fri, 23 Feb 2018 17:31:03 +0100 Subject: [PATCH 1/3] Run entrypoint though sh instead of dumb-init with Alpine --- Dockerfile.alpine | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index e0b51710b..83c6f7f30 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -6,7 +6,7 @@ VOLUME /config ENV DOCKERIZE_VERSION=v0.6.0 RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk --no-cache add dumb-init ip6tables ufw@testing openvpn shadow transmission-daemon \ + && apk --no-cache add ip6tables ufw@testing openvpn shadow transmission-daemon \ && echo "Install dockerize $DOCKERIZE_VERSION" \ && wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \ && mkdir -p /opt/transmission-ui/combustion-release /opt/transmission-ui/kettu \ @@ -108,4 +108,4 @@ ENV OPENVPN_USERNAME=**None** \ # Expose port and run EXPOSE 9091 -CMD ["dumb-init", "/etc/openvpn/start.sh"] +CMD ["sh", "/etc/openvpn/start.sh"] From 7e0086f975fe33cc160cb6d7c52d8f5f32b4a97f Mon Sep 17 00:00:00 2001 From: e7d Date: Fri, 23 Feb 2018 17:42:43 +0100 Subject: [PATCH 2/3] Add dumb-init back and add bash dependency to Alpine container --- Dockerfile.alpine | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 83c6f7f30..f0e543f0a 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -6,7 +6,7 @@ VOLUME /config ENV DOCKERIZE_VERSION=v0.6.0 RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk --no-cache add ip6tables ufw@testing openvpn shadow transmission-daemon \ + && apk --no-cache add bash dumb-init ip6tables ufw@testing openvpn shadow transmission-daemon \ && echo "Install dockerize $DOCKERIZE_VERSION" \ && wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \ && mkdir -p /opt/transmission-ui/combustion-release /opt/transmission-ui/kettu \ @@ -108,4 +108,4 @@ ENV OPENVPN_USERNAME=**None** \ # Expose port and run EXPOSE 9091 -CMD ["sh", "/etc/openvpn/start.sh"] +CMD ["dumb-init", "/etc/openvpn/start.sh"] From cd9ee23d0c3cd8c1d4701296f0fc542c49a3ef74 Mon Sep 17 00:00:00 2001 From: e7d Date: Fri, 23 Feb 2018 18:01:08 +0100 Subject: [PATCH 3/3] Fix kettu installation for Alpine image --- Dockerfile.alpine | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile.alpine b/Dockerfile.alpine index f0e543f0a..d9c5f8b54 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -9,11 +9,12 @@ RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/ap && apk --no-cache add bash dumb-init ip6tables ufw@testing openvpn shadow transmission-daemon \ && echo "Install dockerize $DOCKERIZE_VERSION" \ && wget -qO- https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | tar xz -C /usr/bin \ - && mkdir -p /opt/transmission-ui/combustion-release /opt/transmission-ui/kettu \ + && mkdir -p /opt/transmission-ui \ && echo "Install Combustion" \ && wget -qO- https://github.com/Secretmapper/combustion/archive/release.tar.gz | tar xz -C /opt/transmission-ui \ && echo "Install kettu" \ - && wget -qO- https://github.com/endor/kettu/archive/master.tar.gz | tar xz -C /opt/transmission-ui/kettu \ + && wget -qO- https://github.com/endor/kettu/archive/master.tar.gz | tar xz -C /opt/transmission-ui \ + && mv /opt/transmission-ui/kettu-master /opt/transmission-ui/kettu \ && rm -rf /tmp/* /var/tmp/* \ && groupmod -g 1000 users \ && useradd -u 911 -U -d /config -s /bin/false abc \