Merge pull request #10 from NetLah/dev/10.7.1_40

- Update CrushFTP v10.7.1_40
- Update Alpine 3.19
- Switch to Java eclipse-temurin:17-jre-alpine

.github/workflows/crushftp-source.yml

@@ -14,19 +14,19 @@ jobs:
     name: crushftp-source
     runs-on: ubuntu-latest
     env:
-      CRUSHFTP_VERSION: "10.5.4"
+      CRUSHFTP_VERSION: "10.7.1"
       IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
       SKIP_DOCKER: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         if: ${{ success() && env.SKIP_DOCKER != 'true' }}
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
         if: ${{ success() && env.SKIP_DOCKER != 'true' && github.event_name != 'pull_request' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: "${{ secrets.DOCKER_HUB_USERNAME }}"
           password: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"

.github/workflows/docker-crushftp.yml

@@ -15,20 +15,22 @@ jobs:
       fail-fast: false
     name: docker-crushftp
     runs-on: ubuntu-latest
+    environment: development
     env:
-      CRUSHFTP_VERSION: "10.5.4"
+      CRUSHFTP_VERSION: "10.7.1_40"
       IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
+      IS_DEV: ${{ startsWith(github.ref, 'refs/heads/dev') }}
       SKIP_DOCKER: false
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         if: ${{ success() && env.SKIP_DOCKER != 'true' }}
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
         if: ${{ success() && env.SKIP_DOCKER != 'true' }}
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: "${{ secrets.DOCKER_HUB_USERNAME }}"
           password: "${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}"
@@ -65,4 +67,20 @@ jobs:
             }
           }
           $repos += @('${{ secrets.DOCKER_HUB_REPOS }}')
-          ./docker-build.ps1 -dockerRepository $repos -crushFtpVersion $crushFtpVersion -imageTag $imageTag -WhatIf:$whatIf -Latest:$latest -Verbose
+          $params = @{
+            dockerRepository = $repos
+            crushFtpVersion  = $crushFtpVersion
+            imageTag         = $imageTag
+            WhatIf           = $whatIf
+            Latest           = $latest
+          }
+          if ('${{ env.IS_DEV }}' -eq $true) {
+            $sourceImage = '${{ vars.CRUSHFTP_SOURCE_DEV }}'
+          } else {
+            $sourceImage = '${{ vars.CRUSHFTP_SOURCE }}'
+          }
+          if($sourceImage) {
+            $params.sourceImage = $sourceImage
+            Write-Host "Set source to '$sourceImage'"
+          }
+          ./docker-build.ps1 @params -Verbose

README.md

@@ -4,8 +4,8 @@ CrushFTP 10 Server provides FTP, Implicit FTPS, SFTP, HTTP, or HTTPS
 
 ## Docker Specifications
 
-- Base: Alpine 3.13 Linux, OpenJDK 17, `microblink/java:17`
-- CrushFTP 10 (v10.4.0) (required commercial license [pricing](https://www.crushftp.com/pricing.html))
+- Base: Alpine 3.19 Linux, OpenJDK 17, `eclipse-temurin:17-jre-alpine`
+- CrushFTP 10 (v10.7.1) (required commercial license [pricing](https://www.crushftp.com/pricing.html))
 - Dockerfile: https://github.com/NetLah/docker-crushftp
 
 This container [hub.docker.com/r/netlah/crushftp](https://hub.docker.com/r/netlah/crushftp) is distributed under the [MIT Licence](LICENSE).
@@ -54,3 +54,5 @@ docker logs <container_id/container_name>
 - Visit the [CrushFTP 10 Wiki](https://www.crushftp.com/crush10wiki/)
 - Docker sample [CrushFTP 10 Docker sample](https://www.crushftp.com/crush10wiki/Wiki.jsp?page=Docker)
 - A [CrushFTP 10 Dockerization](https://github.com/MarkusMcNugen/docker-CrushFTP)
+- Prebuilt OpenJDK by [Adoptium](https://adoptium.net/), project [Eclipse Temurin](https://adoptium.net/temurin/)
+- Java docker [eclipse-temurin](https://hub.docker.com/_/eclipse-temurin)

crushftp-source/Dockerfile

@@ -1,6 +1,6 @@
-# alpine:3.13
-# buildargs: REPO=alpine:3.13 CRUSHFTP_VERSION=10.1.0_62 SOURCE_METHOD=wget or add SOURCE_ZIP=https://www.crushftp.com/early10/CrushFTP10.zip
-ARG REPO=alpine:3.13
+# alpine:3.19.1
+# buildargs: REPO=alpine:3.19.1 CRUSHFTP_VERSION=10.7.1_40 SOURCE_METHOD=wget or add SOURCE_ZIP=https://www.crushftp.com/early10/CrushFTP10.zip
+ARG REPO=alpine:3.19.1
 ARG SOURCE_METHOD=wget
 
 FROM $REPO AS base
@@ -33,7 +33,7 @@ FROM base as final
 WORKDIR /src
 COPY --from=zip /src .
 
-ARG CRUSHFTP_VERSION=10.1.0_62
+ARG CRUSHFTP_VERSION=10.7.1_40
 ENV CRUSHFTP_VERSION=$CRUSHFTP_VERSION
 LABEL org.opencontainers.image.authors="https://github.com/NetLah"\
   org.opencontainers.image.url="https://hub.docker.com/r/netlah/crushftp-source"\

crushftp-source/README.md

@@ -4,8 +4,8 @@ This intermediate docker image contains crushftp.zip for next docker build image
 
 ## Docker Specifications
 
-- Base: Alpine 3.13 Linux
-- CrushFTP 10 (v10.5.4)
+- Base: Alpine 3.19 Linux
+- CrushFTP 10 (v10.7.1)
 - Repository: [hub.docker.com/r/netlah/crushftp](hub.docker.com/r/netlah/crushftp)
 - Docker: [hub.docker.com/r/netlah/crushftp-source](hub.docker.com/r/netlah/crushftp-source)
 

crushftp/Dockerfile

@@ -1,6 +1,6 @@
-# alpine:3.13
-ARG REPO=microblink/java:17
-ARG CRUSHFTP_VERSION=10.5.1
+# alpine:3.19.1
+ARG REPO=eclipse-temurin:17-jre-alpine
+ARG CRUSHFTP_VERSION=10.7.1_40
 ARG SOURCE=netlah/crushftp-source:$CRUSHFTP_VERSION
 FROM $REPO AS base
 
@@ -12,7 +12,7 @@ ADD $STARTUP /src/var/opt/startup.sh
 ADD service.sh /src/var/opt/service.sh
 WORKDIR /src/tmp
 COPY --from=src src/crushftp.zip .
-ARG CRUSHFTP_VERSION=10.5.1
+ARG CRUSHFTP_VERSION=10.7.1_40
 RUN date '+%F %T %Z'>>__builddate.txt \
   && echo "CrushFTP Version = $CRUSHFTP_VERSION">>__version.txt \
   && echo "Build Date Time  = `cat __builddate.txt`">>__version.txt \
@@ -30,7 +30,7 @@ RUN ln -s /var/opt/service.sh /usr/sbin/service \
   && chmod +x service.sh startup.sh
 ENTRYPOINT [ "/bin/bash", "-c", "/var/opt/startup.sh" ]
 
-ARG CRUSHFTP_VERSION=10.5.1
+ARG CRUSHFTP_VERSION=10.7.1_40
 ENV ADMIN_USER=crushadmin \
   ADMIN_PASSWORD= \
   WEB_PROTOCOL=http \
@@ -47,6 +47,6 @@ EXPOSE 21 2222 443 8080 9090
 LABEL org.opencontainers.image.authors="https://github.com/NetLah" \
   org.opencontainers.image.url="https://hub.docker.com/r/netlah/crushftp" \
   org.opencontainers.image.source="https://github.com/NetLah/docker-crushftp" \
-  org.opencontainers.image.description="CrushFTP 10 server on Alpine Linux 3.13 and OpenJDK 17." \
+  org.opencontainers.image.description="CrushFTP 10 server on Alpine Linux 3.19 and OpenJDK 17." \
   org.opencontainers.image.version="$CRUSHFTP_VERSION"\
   version="$CRUSHFTP_VERSION"

crushftp/startup.sh

@@ -5,7 +5,8 @@ cat >/etc/motd <<EOL
  | (__| '_| || (_-< ' \| _|  | | |  _/ | | () |
   \___|_|  \_,_/__/_||_|_|   |_| |_|   |_|\__/ 
 
-CrushFTP 10, Alpine 3.13, OpenJDK 17
+CrushFTP 10, $(source /etc/os-release;echo $PRETTY_NAME)
+$(java -version 2>&1)
 Build Time: `cat /tmp/__builddate.txt`
 Start Time: `date '+%F %T %Z'`
 EOL