From 76bd2acca5328ede3375f603600b727338244e2d Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sat, 27 Mar 2021 17:18:16 +0100
Subject: [PATCH] WIP

---
 .github/workflows/dependabot.yml |  7 +++++++
 .github/workflows/release.yml    | 24 +++++++++++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 .github/workflows/dependabot.yml

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
new file mode 100644
index 000000000..583decfd1
--- /dev/null
+++ b/.github/workflows/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9eccd404d..cf832b628 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,6 +26,7 @@ jobs:
       - name: Build with Maven
         run: mvn clean install -DskipTests
   docker:
+    name: "Docker build & push"
     runs-on: ubuntu-latest
     needs: build
     steps:
@@ -34,6 +35,10 @@ jobs:
       - name: "Get tag name"
         id: tag
         uses: dawidd6/action-get-tag@v1
+      - name: "Set up QEMU"
+        uses: docker/setup-qemu-action@v1
+      - name: "Set up Docker Buildx"
+        uses: docker/setup-buildx-action@v1
       - name: "Login to dockerhub"
         uses: docker/login-action@v1
         with:
@@ -42,13 +47,17 @@ jobs:
       - name: "Build and push"
         uses: docker/build-push-action@v2
         with:
+          run: cd docker
           context: .
           file: docker/Dockerfile
           push: false #todo enable
+          platforms: linux/amd64
           tags: |
             webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
           build-args: |
             webgoat_version=${{ steps.tag.outputs.tag }}
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
   github_release:
     name: Create Release
     runs-on: ubuntu-latest
@@ -67,7 +76,7 @@ jobs:
             webgoat-server/target/*.jar
             webwolf/target/*.jar
           body: |
-            ## Version 8.
+            ## Version ${{ steps.tag.outputs.tag }}
 
             ### New functionality
 
@@ -90,15 +99,4 @@ jobs:
 
             Team WebGoat
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ steps.tag.outputs.tag }}
-          release_name: ${{ steps.tag.outputs.tag }}
-
-          draft: false
-          prerelease: false
\ No newline at end of file
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file