From e53b12c9c528cf40aedc166dca4d01262f0f982f Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 11:38:02 +0100 Subject: [PATCH 1/4] Bumping version to 5.1.10 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bd96b42..ed45e0a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.9 \ No newline at end of file +5.1.10 \ No newline at end of file From 7fed4096cf5c6ade5e5f6caae7c7ebf0b6733b76 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 11:38:19 +0100 Subject: [PATCH 2/4] Using latest base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3eee9ab..190cf2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/bfren/alpine-s6:alpine3.24-6.2.0 +FROM quay.io/bfren/alpine-s6:alpine3.24-6.2.1 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-ftps" From 46748fa6dce2858a90ce6e0f27e0eaabc217ba07 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 11:40:14 +0100 Subject: [PATCH 3/4] Updating GitHub workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/dev.yml | 14 +++++++------- .github/workflows/publish.yml | 12 ++++++------ .github/workflows/update-readme.yml | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 0d434ac..61886a1 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Checkout Branch ${{ github.ref_name }} - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Create Pull Request run: gh pr create -B main --title "${{ github.ref_name }}" --body "Merging branch to create ${{ github.ref_name }}." diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1dd209f..31dfe4f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -28,19 +28,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -48,7 +48,7 @@ jobs: - name: Build and export id: docker_export - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: build-args: | BF_IMAGE=${{ env.REPOSITORY_NAME }} @@ -63,7 +63,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: build-args: | BF_IMAGE=${{ env.REPOSITORY_NAME }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8a9d198..ef766a4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Get repository name run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV @@ -54,19 +54,19 @@ jobs: id: version - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: quay.io username: ${{ github.repository_owner }} @@ -74,7 +74,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: build-args: | BF_IMAGE=${{ env.REPOSITORY_NAME }} diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml index 7153006..31e6472 100644 --- a/.github/workflows/update-readme.yml +++ b/.github/workflows/update-readme.yml @@ -15,10 +15,10 @@ jobs: shell: bash - name: Checkout code - uses: actions/checkout@v6 + uses: actions/checkout@v7 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 8f9c7d7ecddbbf80d8f9f17653c0bdea23a84009 Mon Sep 17 00:00:00 2001 From: bfren Date: Sun, 12 Jul 2026 11:41:17 +0100 Subject: [PATCH 4/4] Using new submodule arrangement --- overlay/etc/nu/scripts/bf-ftps/{log.nu => log/mod.nu} | 0 overlay/etc/nu/scripts/bf-ftps/mod.nu | 4 ++-- overlay/etc/nu/scripts/bf-ftps/{run.nu => run/mod.nu} | 0 overlay/etc/s6-overlay/s6-rc.d/vsftpd/run | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename overlay/etc/nu/scripts/bf-ftps/{log.nu => log/mod.nu} (100%) rename overlay/etc/nu/scripts/bf-ftps/{run.nu => run/mod.nu} (100%) diff --git a/overlay/etc/nu/scripts/bf-ftps/log.nu b/overlay/etc/nu/scripts/bf-ftps/log/mod.nu similarity index 100% rename from overlay/etc/nu/scripts/bf-ftps/log.nu rename to overlay/etc/nu/scripts/bf-ftps/log/mod.nu diff --git a/overlay/etc/nu/scripts/bf-ftps/mod.nu b/overlay/etc/nu/scripts/bf-ftps/mod.nu index d9bb951..2d304c9 100644 --- a/overlay/etc/nu/scripts/bf-ftps/mod.nu +++ b/overlay/etc/nu/scripts/bf-ftps/mod.nu @@ -1,2 +1,2 @@ -export module log.nu -export module run.nu +export use bf-ftps/log +export use bf-ftps/run diff --git a/overlay/etc/nu/scripts/bf-ftps/run.nu b/overlay/etc/nu/scripts/bf-ftps/run/mod.nu similarity index 100% rename from overlay/etc/nu/scripts/bf-ftps/run.nu rename to overlay/etc/nu/scripts/bf-ftps/run/mod.nu diff --git a/overlay/etc/s6-overlay/s6-rc.d/vsftpd/run b/overlay/etc/s6-overlay/s6-rc.d/vsftpd/run index 0e985a3..04c57ac 100644 --- a/overlay/etc/s6-overlay/s6-rc.d/vsftpd/run +++ b/overlay/etc/s6-overlay/s6-rc.d/vsftpd/run @@ -7,7 +7,7 @@ set -euo pipefail # Run preflight checks #====================================================================================================================== -nu -c "use bf-ftps run ; run preflight" +nu -c "use bf-ftps/run * ; preflight" #======================================================================================================================