🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2022-10-14 10:12:57 -04:00
parent 66da879e54
commit 8070b5921c
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
2 changed files with 6 additions and 3 deletions

View File

@ -18,9 +18,12 @@ RUN set -ex; \
echo "http://dl-cdn.alpinelinux.org/alpine/$alpine_version/community" >> "/etc/apk/repositories"; \ 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 ; \ 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 \ apk update --update-cache && apk add \
openrc
podman-openrc
podman \ podman \
podman-docker \ podman-docker \
podman-tui podman-tui &&
rc-update add podman default
COPY ./bin/. /usr/local/bin/ COPY ./bin/. /usr/local/bin/
COPY ./data/. /usr/local/share/template-files/data/ COPY ./data/. /usr/local/share/template-files/data/
@ -66,7 +69,7 @@ VOLUME [ "/config","/data" ]
EXPOSE $PORTS EXPOSE $PORTS
ENTRYPOINT [ "tini", "-p", "SIGTERM", "--" ] ENTRYPOINT [ "/sbin/init" ]
CMD [ "/usr/local/bin/entrypoint-podman.sh" ] CMD [ "/usr/local/bin/entrypoint-podman.sh" ]
HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint-podman.sh", "healthcheck" ] HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint-podman.sh", "healthcheck" ]

View File

@ -172,7 +172,7 @@ podman | docker)
*) # Execute primary command *) # Execute primary command
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
podman-tui /etc/init.d/podman start
exit ${exitCode:-$?} exit ${exitCode:-$?}
else else
__exec_command "$@" __exec_command "$@"