summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorWes van der Vleuten <16665772+WesVleuten@users.noreply.github.com>2023-01-21 23:35:39 +0100
committerWes van der Vleuten <16665772+WesVleuten@users.noreply.github.com>2023-01-21 23:35:39 +0100
commit420e12bb8b4809f819ef4f6cb06c33338d42f125 (patch)
tree4d85abadb39c4a02a04d669da467eb8a4e610790 /docker
parent7fd205179b5707a2774d83866f5a35b2bd8cfe16 (diff)
parent4e3884cae749ffcc39b77f2dcb6bc336c255d2e5 (diff)
downloadinvidious-420e12bb8b4809f819ef4f6cb06c33338d42f125.tar.gz
invidious-420e12bb8b4809f819ef4f6cb06c33338d42f125.tar.bz2
invidious-420e12bb8b4809f819ef4f6cb06c33338d42f125.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile3
-rw-r--r--docker/Dockerfile.arm643
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 34549df1..57864883 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,7 +43,7 @@ RUN if [[ "${release}" == 1 && "${disable_quic}" == 1 ]] ; then \
FROM alpine:3.16
-RUN apk add --no-cache librsvg ttf-opensans
+RUN apk add --no-cache librsvg ttf-opensans tini
WORKDIR /invidious
RUN addgroup -g 1000 -S invidious && \
adduser -u 1000 -S invidious -G invidious
@@ -58,4 +58,5 @@ RUN chmod o+rX -R ./assets ./config ./locales
EXPOSE 3000
USER invidious
+ENTRYPOINT ["/sbin/tini", "--"]
CMD [ "/invidious/invidious" ]
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index ef3284b1..10135efb 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -42,7 +42,7 @@ RUN if [[ "${release}" == 1 && "${disable_quic}" == 1 ]] ; then \
fi
FROM alpine:3.16
-RUN apk add --no-cache librsvg ttf-opensans
+RUN apk add --no-cache librsvg ttf-opensans tini
WORKDIR /invidious
RUN addgroup -g 1000 -S invidious && \
adduser -u 1000 -S invidious -G invidious
@@ -57,4 +57,5 @@ RUN chmod o+rX -R ./assets ./config ./locales
EXPOSE 3000
USER invidious
+ENTRYPOINT ["/sbin/tini", "--"]
CMD [ "/invidious/invidious" ]