Merge branch 'main' into exec-fix

.github/FUNDING.yml

@@ -1 +1 @@
-ko_fi: garethflowers
+custom: "https://paypal.me/garethflowers"

.github/workflows/dependabot-auto.yml

@@ -0,0 +1,26 @@
+name: Dependabot PR Approve and Merge
+on: pull_request_target
+permissions:
+  contents: write
+  pull-requests: write
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot Metadata
+        id: dependabot-metadata
+        uses: dependabot/[email protected]
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Enable auto-merge for Dependabot PRs
+        if: ${{ steps.dependabot-metadata.outputs.update-type != 'version-update:semver-major' }}
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Prepare
         id: prep
-        uses: docker/[email protected].0
+        uses: docker/[email protected].1
         with:
           images: |
             ${{ github.repository_owner }}/ftp-server
@@ -45,7 +45,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
@@ -54,7 +54,7 @@ jobs:
           labels: ${{ steps.prep.outputs.labels }}
       - name: Update Description
         continue-on-error: true
-        uses: peter-evans/dockerhub-description@v3
+        uses: peter-evans/dockerhub-description@v4
         with:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: ${{ github.repository_owner }}/ftp-server

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.19.0
+FROM alpine:3.20.3
 ENV FTP_USER=foo \
 	FTP_PASS=bar \
 	GID=1000 \

README.md

@@ -5,11 +5,13 @@ A simple FTP server, using
 
 ## How to use this image
 
-### start a FTP Server instance
+### Start a FTP Server instance
 
 To start a container, with data stored in `/data` on the host, use the
 following:
 
+#### ... via `docker run`
+
 ```sh
 docker run \
 	--detach \
@@ -22,7 +24,7 @@ docker run \
 	garethflowers/ftp-server
 ```
 
-### ... via `docker compose`
+#### ... via `docker compose`
 
 ```yml
 services:
@@ -34,7 +36,7 @@ services:
     image: garethflowers/ftp-server
     ports:
       - '20-21:20-21/tcp'
-      - '40000-40009:40000-40009/tcp'
+      - '40000-40009:40000-40009/tcp' # Only needed for passive mode
     volumes:
       - '/data:/home/user'
 ```