chore(deps): bump alpine from 3.18.3 to 3.18.4 (#65)

Bumps alpine from 3.18.3 to 3.18.4.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_size = 2
+indent_style = space

.github/dependabot.yml

@@ -2,5 +2,16 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    reviewers:
+      - "garethflowers"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    commit-message:
+      include: "scope"
+      prefix: "chore"
+    directory: "/"
+    reviewers:
+      - "garethflowers"
     schedule:
       interval: "daily"

.github/workflows/publish.yml

@@ -1,18 +1,23 @@
-name: Publish
+name: Build and Publish Images
 on:
+  pull_request:
+    branches:
+      - main
   push:
-    branches: main
+    branches:
+      - main
     tags:
       - "*.*.*"
 jobs:
-  main:
+  publish:
+    name: Publish
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Prepare
         id: prep
-        uses: crazy-max/ghaction-docker-meta@v2
+        uses: docker/metadata-action@v5.0.0
         with:
           images: |
             ${{ github.repository_owner }}/ftp-server
@@ -23,32 +28,35 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to GHCR
-        uses: docker/login-action@v1
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and Push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
           labels: ${{ steps.prep.outputs.labels }}
       - name: Update Description
         continue-on-error: true
-        uses: peter-evans/dockerhub-description@v2
+        uses: peter-evans/dockerhub-description@v3
         with:
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: ${{ github.repository_owner }}/ftp-server
           short-description: ${{ github.event.repository.description }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}

Dockerfile

@@ -1,17 +1,15 @@
-FROM alpine:3.13.4
-
+FROM alpine:3.18.4
 ENV FTP_USER=foo \
 	FTP_PASS=bar \
 	GID=1000 \
 	UID=1000
 
 RUN apk add --no-cache --update \
-	vsftpd==3.0.3-r6
+	vsftpd==3.0.5-r2
 
 COPY [ "/src/vsftpd.conf", "/etc" ]
 COPY [ "/src/docker-entrypoint.sh", "/" ]
 
-CMD [ "/usr/sbin/vsftpd" ]
 ENTRYPOINT [ "/docker-entrypoint.sh" ]
 EXPOSE 20/tcp 21/tcp 40000-40009/tcp
 HEALTHCHECK CMD netstat -lnt | grep :21 || exit 1

README.md

@@ -5,7 +5,7 @@ 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:
@@ -22,6 +22,23 @@ docker run \
 	garethflowers/ftp-server
 ```
 
+### ... via `docker compose`
+
+```yml
+services:
+  ftp-server:
+    container_name: my-ftp-server
+    environment:
+      - FTP_PASS=123
+      - FTP_USER=user
+    image: garethflowers/ftp-server
+    ports:
+      - '20-21:20-21/tcp'
+      - '40000-40009:40000-40009/tcp'
+    volumes:
+      - '/data:/home/user'
+```
+
 ## License
 
 -   This image is released under the

_config.yml

@@ -0,0 +1,10 @@
+docker_repository: garethflowers/ftp-server
+author: garethflowers
+plugins:
+  - jekyll-remote-theme
+  - jekyll-sitemap
+remote_theme: garethflowers/garethflowers.github.io
+tagline: Gareth Flowers
+twitter:
+  username: garethflowers
+  card: summary

src/docker-entrypoint.sh

@@ -17,4 +17,9 @@ mkdir -p /home/$FTP_USER
 chown -R $FTP_USER:$FTP_USER /home/$FTP_USER
 echo "$FTP_USER:$FTP_PASS" | /usr/sbin/chpasswd
 
-exec "$@"
+touch /var/log/vsftpd.log
+tail -f /var/log/vsftpd.log | tee /dev/stdout &
+touch /var/log/xferlog
+tail -f /var/log/xferlog | tee /dev/stdout &
+
+/usr/sbin/vsftpd

src/vsftpd.conf

@@ -6,8 +6,8 @@ session_support=NO
 
 # access
 anonymous_enable=NO
-local_enable=YES
 ftpd_banner=FTP Server
+local_enable=YES
 
 # local user
 allow_writeable_chroot=YES
@@ -17,22 +17,30 @@ local_umask=022
 passwd_chroot_enable=YES
 
 # directory
+dirlist_enable=YES
 dirmessage_enable=NO
 hide_ids=YES
 
 # file transfer
 write_enable=YES
 
+# logging
+dual_log_enable=YES
+log_ftp_protocol=YES
+xferlog_enable=YES
+
 # network
+connect_from_port_20=NO
+ftp_data_port=20
 max_clients=0
 max_per_ip=0
-pasv_enable=YES
 pasv_address=0.0.0.0
+pasv_addr_resolve=YES
+pasv_promiscuous=YES
+pasv_enable=YES
 pasv_max_port=40009
 pasv_min_port=40000
 port_enable=YES
-ftp_data_port=20
-connect_from_port_20=YES
 
 # tweaks
 seccomp_sandbox=NO

test.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -xe
+export IMAGE_NAME=garethflowers/ftp-server
+
+docker build --tag $IMAGE_NAME .
+docker run --rm $IMAGE_NAME sh -c 'vsftpd -version 0>&1'
+
+echo "\nOK"