🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2022-10-14 11:11:27 -04:00
parent 9b9f27bee0
commit 64533ec931
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
2 changed files with 4 additions and 10 deletions

View File

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

View File

@ -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
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -