From 64533ec931a998a7bcf8815fe6e855a484d45894 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Fri, 14 Oct 2022 11:11:27 -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               |  4 +++-
 bin/entrypoint-podman.sh | 10 +---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8cfa207..8896f60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ ENV TZ="$TIMEZONE" \
 
 RUN set -ex; \
   rm -Rf "/etc/apk/repositories"; \
+  mkdir -p "/usr/local/share/template-files/config/defaults/containers" && \
   echo "http://dl-cdn.alpinelinux.org/alpine/$alpine_version/main" >> "/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 ; \
@@ -23,7 +24,8 @@ RUN set -ex; \
   podman \
   podman-docker \
   podman-tui && \
-  rc-update add podman default
+  rc-update add podman default && \
+  cp -Rf "/etc/containers/." "/usr/local/share/template-files/config/defaults/containers/"
 
 COPY ./bin/. /usr/local/bin/
 COPY ./data/. /usr/local/share/template-files/data/
diff --git a/bin/entrypoint-podman.sh b/bin/entrypoint-podman.sh
index a2b17d7..75eb967 100755
--- a/bin/entrypoint-podman.sh
+++ b/bin/entrypoint-podman.sh
@@ -97,14 +97,6 @@ fi
 [ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
 [ -d "/config" ] && rm -Rf "/config/.gitkeep" "/data"/*/*.gitkeep
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Setup bin directory
-if [ -d "/config/bin" ]; then
-  for bin in /config/bin/*; do
-    name="$(basename "$bin")"
-    ln -sf "$bin" "/usr/local/bin/$name"
-  done
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create directories
 [ -d "/etc/ssl" ] || mkdir -p "/etc/ssl"
 [ -d "/usr/local/bin" ] && rm -Rf "/usr/local/bin/.gitkeep"
@@ -129,7 +121,7 @@ fi
 [ -f "$SSL_CERT" ] && cp -Rfv "$SSL_CERT" "/etc/ssl/server.crt"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create default config
-if [ ! -e "/config/$APPNAME" ] && [ -e "$DEFAULT_CONF_DIR/$APPNAME" ]; then
+if [ ! -e "/config/containers" ] && [ -e "$DEFAULT_CONF_DIR/containers" ]; then
   cp -Rf "$DEFAULT_CONF_DIR/$APPNAME" "/config/$APPNAME"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -