aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJacen <jacen92@gmail.com>2019-07-08 16:07:58 +0200
committerChocobozzz <me@florianbigard.com>2019-07-08 16:07:58 +0200
commit7593d9f87278063fc99bef5df3584aec67ed79d1 (patch)
tree4033b406b3f3ba922fa6ef216168eb8e4ec4fbf7
parent512a575971874a8d271ba245bbb4d02ff24a668e (diff)
downloadPeerTube-7593d9f87278063fc99bef5df3584aec67ed79d1.tar.gz
PeerTube-7593d9f87278063fc99bef5df3584aec67ed79d1.tar.zst
PeerTube-7593d9f87278063fc99bef5df3584aec67ed79d1.zip
replace npm and apt-get by yarn and apt in dockerfile.stretch (#1952)
* replace npm and apt-get by yarn and apt in dockerfile.stretch * keep consistancy
-rw-r--r--support/docker/production/Dockerfile.stretch16
1 files changed, 8 insertions, 8 deletions
diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 5025341f1..0cc764508 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -1,14 +1,14 @@
1FROM node:8-stretch 1FROM node:8-stretch
2 2
3# Allow to pass extra options to the npm run build 3# Allow to pass extra options to the yarn run build
4# eg: --light --light-fr to not build all client languages 4# eg: --light --light-fr to not build all client languages
5# (speed up build time if i18n is not required) 5# (speed up build time if i18n is not required)
6ARG NPM_RUN_BUILD_OPTS 6ARG NPM_RUN_BUILD_OPTS
7 7
8RUN set -ex; \ 8RUN set -ex; \
9 if ! command -v gpg > /dev/null; then \ 9 if ! command -v gpg > /dev/null; then \
10 apt-get update; \ 10 apt update; \
11 apt-get install -y --no-install-recommends \ 11 apt install -y --no-install-recommends \
12 gnupg \ 12 gnupg \
13 dirmngr \ 13 dirmngr \
14 ; \ 14 ; \
@@ -16,8 +16,8 @@ RUN set -ex; \
16fi 16fi
17 17
18# Install dependencies 18# Install dependencies
19RUN apt-get update \ 19RUN apt update \
20 && apt-get -y install ffmpeg \ 20 && apt -y install ffmpeg \
21 && rm /var/lib/apt/lists/* -fR 21 && rm /var/lib/apt/lists/* -fR
22 22
23# Add peertube user 23# Add peertube user
@@ -26,8 +26,8 @@ RUN groupadd -r peertube \
26 26
27# grab gosu for easy step-down from root 27# grab gosu for easy step-down from root
28RUN set -eux; \ 28RUN set -eux; \
29 apt-get update; \ 29 apt update; \
30 apt-get install -y gosu; \ 30 apt install -y gosu; \
31 rm -rf /var/lib/apt/lists/*; \ 31 rm -rf /var/lib/apt/lists/*; \
32 gosu nobody true 32 gosu nobody true
33 33
@@ -59,5 +59,5 @@ COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entr
59ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] 59ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
60 60
61# Run the application 61# Run the application
62CMD ["npm", "start"] 62CMD ["yarn", "start"]
63EXPOSE 9000 63EXPOSE 9000