From a8ca05d51e1053e8469e3bfeafa5b97113a9c6ee Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 14 Oct 2022 10:45:39 -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 | 6 +++++- bin/entrypoint-podman.sh | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6f4253b..e55017f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ 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 \ + devtools \ openrc \ podman-openrc \ podman \ @@ -59,7 +60,10 @@ ENV SHELL="/bin/bash" \ TIMEZONE="$$TIMEZONE" \ PHP_SERVER="none" \ PORT="" \ - DISPLAY=${DISPLAY} + DOCKER_BUILDKIT=0 \ + DOCKER_HOST="unix://run/podman/podman.sock" \ + DISPLAY=${DISPLAY} \ + CONTAINER_PASSPHRASE="" COPY --from=build /. / diff --git a/bin/entrypoint-podman.sh b/bin/entrypoint-podman.sh index 9e28dcd..51438b6 100755 --- a/bin/entrypoint-podman.sh +++ b/bin/entrypoint-podman.sh @@ -108,6 +108,7 @@ fi # Create directories [ -d "/etc/ssl" ] || mkdir -p "/etc/ssl" [ -d "/usr/local/bin" ] && rm -Rf "/usr/local/bin/.gitkeep" +[ -d "/root/.config/podman-tui" ] || mkdir -p "/root/.config/podman-tui" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if [ "$SSL_ENABLED" = "true" ] || [ "$SSL_ENABLED" = "yes" ]; then if [ -f "/config/ssl/server.crt" ] && [ -f "/config/ssl/server.key" ]; then @@ -143,6 +144,14 @@ if [ -d "/config" ] || [ -n "$(__find "/config" 2>/dev/null)" ]; then fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Additional commands +cat <"/root/podman-tui/podman-tui.conf" +[services] + + [services.localhost] + default = true + uri = "unix://run/podman/podman.sock" + +EOF # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case "$1" in