v4.2.0 (#122)

Major updates
* Adding new test framework

Minor updates
* Using latest base image

Build updates
* Publishing to ghcr.io again (closes #115)

Author: bfren

Diff for: .github/workflows/dev.yml

@@ -6,13 +6,10 @@ on:
     tags-ignore: ['**']
   workflow_dispatch:
 
+env:
+  TEST_TAG: ftps:test
+
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout code
-        uses: actions/checkout@v4
   build:
     runs-on: ubuntu-latest
     steps:
@@ -41,6 +38,28 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and export
+        id: docker_export
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            BF_IMAGE=${{ env.REPOSITORY_NAME }}
+            BF_VERSION=${{ steps.version.outputs.contents }}
+          load: true
+          tags: ${{ env.TEST_TAG }}
+      -
+        name: Run tests
+        id: docker_test
+        run: |
+          docker run --entrypoint "/usr/bin/env" ${{ env.TEST_TAG }} -i nu -c "use bf test ; test"
       -
         name: Build and push
         id: docker_build
@@ -54,6 +73,8 @@ jobs:
           tags: |
             bfren/ftps:dev
             bfren/ftps:${{ steps.version.outputs.contents }}-dev
+            ghcr.io/bfren/ftps:dev
+            ghcr.io/bfren/ftps:${{ steps.version.outputs.contents }}-dev
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Diff for: .github/workflows/publish.yml

@@ -64,13 +64,21 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
         uses: docker/build-push-action@v5
         with:
           build-args: |
             BF_IMAGE=${{ env.REPOSITORY_NAME }}
+            BF_PUBLISHING=1
             BF_VERSION=${{ steps.version.outputs.contents }}
           push: true
           platforms: linux/amd64,linux/arm/v7,linux/arm64
@@ -85,6 +93,16 @@ jobs:
             bfren/ftps:vsftpd${{ steps.vsftpd_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
             bfren/ftps:vsftpd${{ steps.vsftpd_revision.outputs.contents }}
             bfren/ftps:vsftpd${{ steps.vsftpd_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/ftps:latest
+            ghcr.io/bfren/ftps:${{ steps.version_major.outputs.contents }}
+            ghcr.io/bfren/ftps:${{ steps.version_minor.outputs.contents }}
+            ghcr.io/bfren/ftps:${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_major.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_major.outputs.contents }}-${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_minor.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_revision.outputs.contents }}
+            ghcr.io/bfren/ftps:vsftpd${{ steps.vsftpd_revision.outputs.contents }}-${{ steps.version.outputs.contents }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Diff for: Dockerfile

@@ -1,8 +1,9 @@
-FROM bfren/alpine-s6:alpine3.19-5.1.3
+FROM bfren/alpine-s6:alpine3.19-5.2.2
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-ftps"
 
 ARG BF_IMAGE
+ARG BF_PUBLISHING
 ARG BF_VERSION
 
 EXPOSE 21 990 18700-18710

Diff for: VERSION

@@ -1 +1 @@
-4.1.4
+4.2.0

Diff for: VERSION_MINOR

@@ -1 +1 @@
-4.1
+4.2

Diff for: overlay/etc/nu/scripts/tests/mod.nu

@@ -6,4 +6,4 @@ if [ -n "${1-}" ] ; then
     git checkout ${1} && git pull
 fi
 
-chmod +x pull.sh run.sh
+chmod +x pull.sh run.sh test.sh

Diff for: pull.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+IMAGE=ftps
+VERSION=`cat VERSION`
+TAG=${IMAGE}-test
+
+docker buildx build \
+    --load \
+    --build-arg BF_IMAGE=${IMAGE} \
+    --build-arg BF_VERSION=${VERSION} \
+    -f Dockerfile \
+    -t ${TAG} \
+    . \
+    && \
+    docker run --entrypoint "/usr/bin/env" ${TAG} -i nu -c "use bf test ; test"