🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2022-10-14 10:45:39 -04:00
parent f216de79b5
commit a8ca05d51e
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
2 changed files with 14 additions and 1 deletions

View File

@ -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 /. /

View File

@ -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 <<EOF >"/root/podman-tui/podman-tui.conf"
[services]
[services.localhost]
default = true
uri = "unix://run/podman/podman.sock"
EOF
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case "$1" in