X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=support%2Fdocker%2Fproduction%2FDockerfile.stretch;h=720f266d376c0c0fadace17b01db84deeaaeed49;hb=244e955e4e15975ac1dec6d852fb966b854ebe10;hp=bf2bae510dad1352c33a38d34f3325cf1ad95825;hpb=399d20eae6ec4e7a7fda1afd0e8b1a11a2cb1714;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index bf2bae510..720f266d3 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,68 +1,46 @@
-FROM node:8-stretch
+FROM node:10-stretch-slim
 
-RUN set -ex; \
-    if ! command -v gpg > /dev/null; then \
-      apt-get update; \
-      apt-get install -y --no-install-recommends \
-        gnupg \
-        dirmngr \
-      ; \
-      rm -rf /var/lib/apt/lists/*; \
-fi
+# Allow to pass extra options to the npm run build
+# eg: --light --light-fr to not build all client languages
+#     (speed up build time if i18n is not required)
+ARG NPM_RUN_BUILD_OPTS
 
 # Install dependencies
-RUN apt-get update \
-    && apt-get -y install ffmpeg \
-    && rm /var/lib/apt/lists/* -fR
+RUN apt update \
+ && apt install -y --no-install-recommends ffmpeg gnupg gosu \
+ && gosu nobody true \
+ && rm /var/lib/apt/lists/* -fR
 
 # Add peertube user
 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)"; \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-    gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-    rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
-    chmod +x /usr/local/bin/gosu; \
-    gosu nobody true; \
-    \
-    apt-get purge -y --auto-remove wget
-
-# Download the latest version
-RUN git clone https://github.com/Chocobozzz/PeerTube /app \
-    && chown -R peertube:peertube /app
-
 # Install PeerTube
-USER peertube
 WORKDIR /app
+COPY . ./
+RUN chown -R peertube:peertube /app
+
+USER peertube
 
 RUN yarn install --pure-lockfile \
-    && npm run build
+    && npm run build -- $NPM_RUN_BUILD_OPTS \
+    && rm -r ./node_modules ./client/node_modules \
+    && yarn install --pure-lockfile --production \
+    && yarn cache clean
+
+USER root
+
+RUN mkdir /data /config
+RUN chown -R peertube:peertube /data /config
 
-# Configure PeerTube
-RUN cp /app/config/default.yaml /app/support/docker/production/config/default.yaml
 ENV NODE_ENV production
-ENV NODE_CONFIG_DIR /app/support/docker/production/config
+ENV NODE_CONFIG_DIR /config
 
-USER root
-RUN mkdir /data && chown peertube:peertube /data
 VOLUME /data
+VOLUME /config
 
-COPY docker-entrypoint.sh /usr/local/bin/
-ENTRYPOINT ["docker-entrypoint.sh"]
+COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 
 # Run the application
 CMD ["npm", "start"]