diff options
| author | crupest <crupest@outlook.com> | 2022-11-25 12:04:36 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2022-11-25 12:04:36 +0800 |
| commit | 4999af9c93861e4de4b2d775e4f9a17c8ec0c1bb (patch) | |
| tree | e4bea2ac2f28a22e31f2b9f9652e6356c09e30a1 /docker | |
| parent | 13271421b6d01b8d544ad77743e6deaf2cd3ff4c (diff) | |
| download | crupest-4999af9c93861e4de4b2d775e4f9a17c8ec0c1bb.tar.gz crupest-4999af9c93861e4de4b2d775e4f9a17c8ec0c1bb.tar.bz2 crupest-4999af9c93861e4de4b2d775e4f9a17c8ec0c1bb.zip | |
Fix auto-* image signal problem.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/auto-backup/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/auto-certbot/Dockerfile | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/docker/auto-backup/Dockerfile b/docker/auto-backup/Dockerfile index 7adf5ef..a883dff 100644 --- a/docker/auto-backup/Dockerfile +++ b/docker/auto-backup/Dockerfile @@ -3,8 +3,8 @@ COPY AutoBackup /AutoBackup WORKDIR /AutoBackup RUN dotnet publish AutoBackup.csproj --configuration Release --output ./publish/ -r linux-x64 --self-contained false -FROM mcr.microsoft.com/dotnet/aspnet:7.0-alpine -RUN apk add --no-cache coreutils bash tar xz +FROM mcr.microsoft.com/dotnet/runtime:7.0-alpine +RUN apk add --no-cache tini coreutils bash tar xz ARG CRUPEST_AUTO_BACKUP_INIT_DELAY=0 ARG CRUPEST_AUTO_BACKUP_INTERVAL=1d ARG CRUPEST_AUTO_BACKUP_COS_SECRET_ID @@ -20,5 +20,5 @@ ENV CRUPEST_AUTO_BACKUP_BUCKET_NAME=${CRUPEST_AUTO_BACKUP_BUCKET_NAME} VOLUME [ "/data" ] COPY daemon.bash /daemon.bash COPY --from=build /AutoBackup/publish /AutoBackup -STOPSIGNAL SIGINT -ENTRYPOINT [ "/daemon.bash" ] +ENTRYPOINT ["/sbin/tini", "--"] +CMD [ "/daemon.bash" ] diff --git a/docker/auto-certbot/Dockerfile b/docker/auto-certbot/Dockerfile index c681141..2f6833d 100644 --- a/docker/auto-certbot/Dockerfile +++ b/docker/auto-certbot/Dockerfile @@ -1,14 +1,16 @@ FROM certbot/certbot:latest -ARG CRUPEST_DOMAIN + ARG CRUPEST_AUTO_CERTBOT_ADDITIONAL_PACKAGES="" +RUN apk add --no-cache tini coreutils bash ${CRUPEST_AUTO_CERTBOT_ADDITIONAL_PACKAGES} + +ARG CRUPEST_DOMAIN ARG CRUPEST_AUTO_CERTBOT_POST_HOOK="" ARG CRUPEST_AUTO_CERTBOT_RENEW_COMMAND="" # install bash ENV CRUPEST_DOMAIN=${CRUPEST_DOMAIN} ENV CRUPEST_AUTO_CERTBOT_POST_HOOK=${CRUPEST_AUTO_CERTBOT_POST_HOOK} ENV CRUPEST_AUTO_CERTBOT_RENEW_COMMAND=${CRUPEST_AUTO_CERTBOT_RENEW_COMMAND} -RUN apk add --no-cache coreutils bash ${CRUPEST_AUTO_CERTBOT_ADDITIONAL_PACKAGES} COPY daemon.bash /daemon.bash VOLUME ["/var/www/certbot", "/etc/letsencrypt", "/var/lib/letsencrypt"] -STOPSIGNAL SIGINT -ENTRYPOINT [ "/daemon.bash" ] +ENTRYPOINT ["/sbin/tini", "--"] +CMD [ "/daemon.bash" ] |