From 0f38519ecf654deda957818e0c3645a6f0a521e7 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Fri, 17 Feb 2023 12:46:16 +0100
Subject: [PATCH] ci: add step for pushing Docker desktop image

---
 .github/workflows/release.yml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c045b1543..56cafee6f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin'
           java-version: 17
           architecture: x64
 
@@ -85,7 +85,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: "Build and push"
+      - name: "Build and push WebGoat"
         uses: docker/build-push-action@v4.0.0
         with:
           context: ./
@@ -98,8 +98,18 @@ jobs:
           build-args: |
             webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
 
-      - name: "Image digest"
-        run: echo ${{ steps.docker_build.outputs.digest }}
+      - name: "Build and push WebGoat desktop"
+        uses: docker/build-push-action@v4.0.0
+        with:
+          context: ./
+          file: ./Dockerfile_desktop
+          push: true
+          platforms: linux/amd64, linux/arm64, linux/arm/v7
+          tags: |
+            webgoat/webgoat-desktop:${{ env.WEBGOAT_TAG_VERSION }}
+            webgoat/webgoat-desktop:latest
+          build-args: |
+            webgoat_version=${{ env.WEBGOAT_MAVEN_VERSION }}
   new_version:
     if: github.repository == 'WebGoat/WebGoat'
     name: Update to next SNAPSHOT version
@@ -118,7 +128,7 @@ jobs:
 
       - name: Set version to next snapshot
         run: |
-          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
+          mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}-SNAPSHOT versions:commit
 
       - name: Push the changes to new branch
         uses: devops-infra/action-commit-push@v0.9.2