IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-11-28 19:44:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix automatic dockerbuild

Browse Source
This commit is contained in:
Chocobozzz 2018-04-16 19:03:56 +02:00
parent 4aeb67a569
commit 33837e8bc2
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
support/docker/production/Dockerfile.stretch
View File

@ -41,7 +41,7 @@ RUN set -ex; \
gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
done; \ done; \
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ 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; \ chmod +x /usr/local/bin/gosu; \
gosu nobody true; \ gosu nobody true; \
\ \
@ -64,7 +64,7 @@ ENV NODE_ENV production
ENV NODE_CONFIG_DIR /app/support/docker/production/config ENV NODE_CONFIG_DIR /app/support/docker/production/config
USER root USER root
RUN mkdir /data RUN mkdir /data && chown peertube:peertube /data
VOLUME /data VOLUME /data
COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh

2
support/docker/production/docker-entrypoint.sh
View File

@ -8,7 +8,7 @@ if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
fi fi
# allow the container to be started with `--user` # allow the container to be started with `--user`
if [ "$1" = 'npm' -a "$(id -u)" != '0' ]; then if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then
chown -R peertube:peertube /data chown -R peertube:peertube /data
exec gosu peertube "$0" "$@" exec gosu peertube "$0" "$@"
fi fi