From 73a48728ee708d7b7a1ae6ae3795e4af7b6af135 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 6 Dec 2018 13:48:33 +0100 Subject: [PATCH] Fix docker build and gosu --- support/docker/production/Dockerfile.stretch | 31 ++++---------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch index 911d064f6..81468bb4f 100644 --- a/support/docker/production/Dockerfile.stretch +++ b/support/docker/production/Dockerfile.stretch @@ -20,32 +20,11 @@ RUN groupadd -r peertube \ && useradd -r -g peertube -m peertube # grab gosu for easy step-down from root -# https://github.com/tianon/gosu/releases -ENV GOSU_VERSION 1.10 -RUN set -ex; \ - \ - fetchDeps='ca-certificates wget'; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - rm -rf /var/lib/apt/lists/*; \ - \ - dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \ - export GNUPGHOME="$(mktemp -d)"; \ - for server in $(shuf -e ha.pool.sks-keyservers.net \ - hkp://p80.pool.sks-keyservers.net:80 \ - keyserver.ubuntu.com \ - hkp://keyserver.ubuntu.com:80 \ - pgp.mit.edu) ; do \ - gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ - done; \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - chmod +x /usr/local/bin/gosu; \ - gosu nobody true; \ - \ - apt-get purge -y --auto-remove wget +RUN set -eux; \ + apt-get update; \ + apt-get install -y gosu; \ + rm -rf /var/lib/apt/lists/*; \ + gosu nobody true # Install PeerTube WORKDIR /app