aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-16 19:03:56 +0200
committerChocobozzz <me@florianbigard.com>2018-04-16 19:04:04 +0200
commit33837e8bc222c29d464d6c6f4a2581ab071f0ad2 (patch)
tree12bea8f20741a1bb2ffbb245b864f3a9e5584df9
parent4aeb67a569b30a233dcff2eaf9c564d62ccd6497 (diff)
downloadPeerTube-33837e8bc222c29d464d6c6f4a2581ab071f0ad2.tar.gz
PeerTube-33837e8bc222c29d464d6c6f4a2581ab071f0ad2.tar.zst
PeerTube-33837e8bc222c29d464d6c6f4a2581ab071f0ad2.zip
Try to fix automatic dockerbuild
-rw-r--r--support/docker/production/Dockerfile.stretch4
-rwxr-xr-xsupport/docker/production/docker-entrypoint.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.stretch
index 5bb67f816..999ab9da4 100644
--- a/support/docker/production/Dockerfile.stretch
+++ b/support/docker/production/Dockerfile.stretch
@@ -41,7 +41,7 @@ RUN set -ex; \
41 gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \ 41 gpg --keyserver "$server" --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 && break || : ; \
42 done; \ 42 done; \
43 gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ 43 gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
44 rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \ 44 rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
45 chmod +x /usr/local/bin/gosu; \ 45 chmod +x /usr/local/bin/gosu; \
46 gosu nobody true; \ 46 gosu nobody true; \
47 \ 47 \
@@ -64,7 +64,7 @@ ENV NODE_ENV production
64ENV NODE_CONFIG_DIR /app/support/docker/production/config 64ENV NODE_CONFIG_DIR /app/support/docker/production/config
65 65
66USER root 66USER root
67RUN mkdir /data 67RUN mkdir /data && chown peertube:peertube /data
68VOLUME /data 68VOLUME /data
69 69
70COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh 70COPY ./support/docker/production/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
diff --git a/support/docker/production/docker-entrypoint.sh b/support/docker/production/docker-entrypoint.sh
index 4099a1984..ba9fcfed5 100755
--- a/support/docker/production/docker-entrypoint.sh
+++ b/support/docker/production/docker-entrypoint.sh
@@ -8,7 +8,7 @@ if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
8fi 8fi
9 9
10# allow the container to be started with `--user` 10# allow the container to be started with `--user`
11if [ "$1" = 'npm' -a "$(id -u)" != '0' ]; then 11if [ "$1" = 'npm' -a "$(id -u)" = '0' ]; then
12 chown -R peertube:peertube /data 12 chown -R peertube:peertube /data
13 exec gosu peertube "$0" "$@" 13 exec gosu peertube "$0" "$@"
14fi 14fi