mirror of https://github.com/Chocobozzz/PeerTube
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 consistancypull/1960/head
parent
512a575971
commit
7593d9f872
|
@ -1,14 +1,14 @@
|
||||||
FROM node:8-stretch
|
FROM node:8-stretch
|
||||||
|
|
||||||
# Allow to pass extra options to the npm run build
|
# Allow to pass extra options to the yarn run build
|
||||||
# eg: --light --light-fr to not build all client languages
|
# eg: --light --light-fr to not build all client languages
|
||||||
# (speed up build time if i18n is not required)
|
# (speed up build time if i18n is not required)
|
||||||
ARG NPM_RUN_BUILD_OPTS
|
ARG NPM_RUN_BUILD_OPTS
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
if ! command -v gpg > /dev/null; then \
|
if ! command -v gpg > /dev/null; then \
|
||||||
apt-get update; \
|
apt update; \
|
||||||
apt-get install -y --no-install-recommends \
|
apt install -y --no-install-recommends \
|
||||||
gnupg \
|
gnupg \
|
||||||
dirmngr \
|
dirmngr \
|
||||||
; \
|
; \
|
||||||
|
@ -16,8 +16,8 @@ RUN set -ex; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update \
|
RUN apt update \
|
||||||
&& apt-get -y install ffmpeg \
|
&& apt -y install ffmpeg \
|
||||||
&& rm /var/lib/apt/lists/* -fR
|
&& rm /var/lib/apt/lists/* -fR
|
||||||
|
|
||||||
# Add peertube user
|
# Add peertube user
|
||||||
|
@ -26,8 +26,8 @@ RUN groupadd -r peertube \
|
||||||
|
|
||||||
# grab gosu for easy step-down from root
|
# grab gosu for easy step-down from root
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
apt-get update; \
|
apt update; \
|
||||||
apt-get install -y gosu; \
|
apt install -y gosu; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
gosu nobody true
|
gosu nobody true
|
||||||
|
|
||||||
|
@ -59,5 +59,5 @@ COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entr
|
||||||
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
|
||||||
|
|
||||||
# Run the application
|
# Run the application
|
||||||
CMD ["npm", "start"]
|
CMD ["yarn", "start"]
|
||||||
EXPOSE 9000
|
EXPOSE 9000
|
||||||
|
|
Loading…
Reference in New Issue