diff options
| author | Émilien Devos <contact@emiliendevos.be> | 2023-01-15 23:37:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-15 23:37:38 +0100 |
| commit | c8fecffbbe4e87aa8f597797b4c2416e5f9dda0d (patch) | |
| tree | 746589f38d5750c125d395c23c1aff6b29a05330 | |
| parent | b779445836f3823b10d910b8ef9973ac60653750 (diff) | |
| parent | 215446e638fdfcb18b92ec5f1e55464c99d39693 (diff) | |
| download | invidious-c8fecffbbe4e87aa8f597797b4c2416e5f9dda0d.tar.gz invidious-c8fecffbbe4e87aa8f597797b4c2416e5f9dda0d.tar.bz2 invidious-c8fecffbbe4e87aa8f597797b4c2416e5f9dda0d.zip | |
Merge pull request #3458 from Craeckie/master
Docker: Added tini for proper signal forwarding
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/Dockerfile.arm64 | 3 |
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" ] |