From 8070b5921cbfe10bb2c06d9381c2c8a9051a0388 Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 14 Oct 2022 10:12:57 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 7 +++++-- bin/entrypoint-podman.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee98ca9..b94741a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,12 @@ RUN set -ex; \ echo "http://dl-cdn.alpinelinux.org/alpine/$alpine_version/community" >> "/etc/apk/repositories"; \ if [ "$alpine_version" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/$alpine_version/testing" >> "/etc/apk/repositories" ; fi ; \ apk update --update-cache && apk add \ + openrc + podman-openrc podman \ podman-docker \ - podman-tui + podman-tui && + rc-update add podman default COPY ./bin/. /usr/local/bin/ COPY ./data/. /usr/local/share/template-files/data/ @@ -66,7 +69,7 @@ VOLUME [ "/config","/data" ] EXPOSE $PORTS -ENTRYPOINT [ "tini", "-p", "SIGTERM", "--" ] +ENTRYPOINT [ "/sbin/init" ] CMD [ "/usr/local/bin/entrypoint-podman.sh" ] HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint-podman.sh", "healthcheck" ] diff --git a/bin/entrypoint-podman.sh b/bin/entrypoint-podman.sh index 605e858..9e28dcd 100755 --- a/bin/entrypoint-podman.sh +++ b/bin/entrypoint-podman.sh @@ -172,7 +172,7 @@ podman | docker) *) # Execute primary command if [ $# -eq 0 ]; then - podman-tui + /etc/init.d/podman start exit ${exitCode:-$?} else __exec_command "$@"