diff --git a/buildargs.env b/buildargs.env index a5a72dc..a622f38 100644 --- a/buildargs.env +++ b/buildargs.env @@ -1,5 +1,5 @@ ## BUILD STAGE -BUILD_TAG=3.23 +BUILD_TAG=3.0 BUILD_BASE_IMAGE=git.pi-farm.de/pi-farm/docker-baseimage-alpine:3.23 BUILD_MAINTAINER=pi-farm BUILD_APP_VERSION=v${BUILD_TAG} diff --git a/root/defaults/alpine-mirror b/root/defaults/alpine-mirror index 650c38f..3f4d5e5 100755 --- a/root/defaults/alpine-mirror +++ b/root/defaults/alpine-mirror @@ -6,33 +6,6 @@ fi src=rsync://rsync.alpinelinux.org/alpine/ dest=/app/www/alpine/ -exclude="--exclude v2.* \ ---exclude v3.0 \ ---exclude v3.1 \ ---exclude v3.3 \ ---exclude v3.4 \ ---exclude v3.5 \ ---exclude v3.6 \ ---exclude v3.7 \ ---exclude v3.8 \ ---exclude v3.9 \ ---exclude v3.10 \ ---exclude v3.11 \ ---exclude v3.12 \ ---exclude v3.13 \ ---exclude v3.14 \ ---exclude v3.15 \ ---exclude v3.16 \ ---exclude v3.17 \ ---exclude v3.18 \ ---exclude v3.19 \ ---exclude v3.20 \ ---exclude v3.21 \ ---exclude v3.22 \ ---exclude v3.23 \ ---exclude edge \ ---exclude latest-stable" - mkdir -p "$dest" /usr/bin/rsync \ --archive \ @@ -42,5 +15,5 @@ mkdir -p "$dest" --delete-after \ --delay-updates \ --timeout=600 \ -$exclude \ +--filter"merge /config/rsync-rules.txt" \ "$src" "$dest" \ No newline at end of file diff --git a/root/defaults/rsync-rules.txt b/root/defaults/rsync-rules.txt new file mode 100644 index 0000000..421cf51 --- /dev/null +++ b/root/defaults/rsync-rules.txt @@ -0,0 +1,3 @@ ++ v3.0/ ++ v3.0/** +- * \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run b/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run index e25b4dc..9c2e257 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-rsync-config/run @@ -9,6 +9,11 @@ if [ ! -f /config/rsyncd.conf ]; then cp /defaults/rsyncd.conf /config/rsyncd.conf fi +if [ ! -f /config/rsync-rules.txt ]; then + echo "Copy default-config..." + cp /defaults/rsync-rules.txt /config/rsync-rules.txt +fi + echo "Set permissions to PUID: ${PUID:-911} and PGID: ${PGID:-1000}" chown -R "${PUID:-911}:${PGID:-1000}" /config chown -R "${PUID:-911}:${PGID:-1000}" /app/www