Change base image to eclipse-temurin:17-jre-alpine; vars.CRUSHFTP_SOURCE

.github/workflows/docker-crushftp.yml

@@ -15,9 +15,11 @@ jobs:
       fail-fast: false
     name: docker-crushftp
     runs-on: ubuntu-latest
+    environment: development
     env:
       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@v4
@@ -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,7 +4,7 @@ CrushFTP 10 Server provides FTP, Implicit FTPS, SFTP, HTTP, or HTTPS
 
 ## Docker Specifications
 
-- Base: Alpine 3.13 Linux, OpenJDK 17, `microblink/java:17`
+- Base: Alpine 3.13 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
 

crushftp/Dockerfile

@@ -1,5 +1,5 @@
-# alpine:3.13
-ARG REPO=microblink/java:17
+# 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

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