From ce254cf882663ed70597bbbd321c262144d0f008 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 18 Nov 2022 12:12:29 +0100 Subject: [PATCH] ntfy : TZ --- podman-ntfy/10_install.sh | 6 +++++- podman-ntfy/ci_build-images.sh | 2 +- podman-ntfy/docker/Dockerfile | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/podman-ntfy/10_install.sh b/podman-ntfy/10_install.sh index 20c11b9..5e5456e 100755 --- a/podman-ntfy/10_install.sh +++ b/podman-ntfy/10_install.sh @@ -14,7 +14,11 @@ if ! podman image exists ${ntfy_image}:${ntfy_version}; then podman image pull ${ntfy_image}:${ntfy_version} || exit 1 fi -podman run --name ${container_name} -p ${listen_if}:${listen_port}:8080 -d ${ntfy_image}:${ntfy_version} serve --listen-http :8080 --base-url ${GARBAYE_NTFY_BASE_URL} && +podman run --name ${container_name} \ + -p ${listen_if}:${listen_port}:8080 \ + -e TZ='Europe/Paris' \ + -d ${ntfy_image}:${ntfy_version} serve \ + --listen-http :8080 --base-url ${GARBAYE_NTFY_BASE_URL} && ( podman logs -f ${container_name} 2>&1 & ) | grep -q 'INFO Listening on' && podman cp config/server.yml ${container_name}:/etc/ntfy/server.yml && podman stop ${container_name} && diff --git a/podman-ntfy/ci_build-images.sh b/podman-ntfy/ci_build-images.sh index 7f535f9..bb22ccd 100755 --- a/podman-ntfy/ci_build-images.sh +++ b/podman-ntfy/ci_build-images.sh @@ -8,7 +8,7 @@ ensure_pwd_is_scriptdir ensure_not_root if ! podman image exists ${ntfy_image}:${ntfy_version}; then - TMPDIR=${HOME} podman build -t "${ntfy_image}:${ntfy_version}" docker/ --build-arg NTFY_VERSION=${ntfy_version} + TMPDIR=${HOME} podman build -t "${ntfy_image}:${ntfy_version}" docker/ --build-arg NTFY_VERSION=${ntfy_version} || exit 1 podman image prune -a -f --filter dangling=true podman image prune -a -f --filter intermediate=true podman image rm -f $(podman images -a -q -- docker.io/library/golang) diff --git a/podman-ntfy/docker/Dockerfile b/podman-ntfy/docker/Dockerfile index 8d3a3c9..5c9ab5f 100644 --- a/podman-ntfy/docker/Dockerfile +++ b/podman-ntfy/docker/Dockerfile @@ -20,6 +20,8 @@ LABEL maintainer="contact@garbaye.fr" EXPOSE 80/tcp +RUN apk add --no-cache tzdata + RUN adduser \ -S -H -D \ ntfy && \