mirror of
https://github.com/casjaysdevdocker/podman
synced 2025-01-18 12:34:37 -05:00
🗃️ Committing everything that changed 🗃️
This commit is contained in:
parent
9b9f27bee0
commit
64533ec931
@ -14,6 +14,7 @@ ENV TZ="$TIMEZONE" \
|
|||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
rm -Rf "/etc/apk/repositories"; \
|
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/main" >> "/etc/apk/repositories"; \
|
||||||
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 ; \
|
||||||
@ -23,7 +24,8 @@ RUN set -ex; \
|
|||||||
podman \
|
podman \
|
||||||
podman-docker \
|
podman-docker \
|
||||||
podman-tui && \
|
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 ./bin/. /usr/local/bin/
|
||||||
COPY ./data/. /usr/local/share/template-files/data/
|
COPY ./data/. /usr/local/share/template-files/data/
|
||||||
|
@ -97,14 +97,6 @@ fi
|
|||||||
[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
|
[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
|
||||||
[ -d "/config" ] && rm -Rf "/config/.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
|
# Create directories
|
||||||
[ -d "/etc/ssl" ] || mkdir -p "/etc/ssl"
|
[ -d "/etc/ssl" ] || mkdir -p "/etc/ssl"
|
||||||
[ -d "/usr/local/bin" ] && rm -Rf "/usr/local/bin/.gitkeep"
|
[ -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"
|
[ -f "$SSL_CERT" ] && cp -Rfv "$SSL_CERT" "/etc/ssl/server.crt"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Create default config
|
# 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"
|
cp -Rf "$DEFAULT_CONF_DIR/$APPNAME" "/config/$APPNAME"
|
||||||
fi
|
fi
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
Loading…
x
Reference in New Issue
Block a user