X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=support%2Fdocker%2Fproduction%2FDockerfile.stretch;h=911d064f6c26c04ae6d07a1439fadf9270ad255b;hb=6d8c8ea73a774c3568e6d28a4cbebcf7979d5c2a;hp=5bb67f81619700b4ef5ae32178b51170a1d0fc3e;hpb=4aeb67a569b30a233dcff2eaf9c564d62ccd6497;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 5bb67f816..911d064f6 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -41,7 +41,7 @@ RUN set -ex; \
         gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
     done; \
     gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-    rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+    rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
     chmod +x /usr/local/bin/gosu; \
     gosu nobody true; \
     \
@@ -49,23 +49,27 @@ RUN set -ex; \
 
 # Install PeerTube
 WORKDIR /app
-RUN chown peertube:peertube /app
-
-COPY --chown=peertube:peertube . ./
+COPY . ./
+RUN chown -R peertube:peertube /app
 
 USER peertube
 
 RUN yarn install --pure-lockfile \
-    && npm run build
+    && npm run build \
+    && 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
 VOLUME /data
+VOLUME /config
 
 COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]