WIP

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/release.yml

@@ -4,101 +4,91 @@ on:
     tags:
       - test*  # todo replace with v*
 jobs:
-  build:
+  release:
-    runs-on: ${{ matrix.os }}
+    name: Release WebGoat
-    strategy:
+    runs-on: ubuntu-latest
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        java: [11, 15]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK ${{ matrix.java }}
+
+      - name: "Get tag name"
+        id: tag
+        uses: dawidd6/action-get-tag@v1
+
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 11
           architecture: x64
+
       - name: Cache Maven packages
         uses: actions/cache@v2
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
+
+      - name: "Set labels for ${{ github.ref }}"
+        run: |
+          echo "WEBGOAT_TAG_VERSION=${{ steps.tag.outputs.tag }}" >> $GITHUB_ENV
+          echo "WEBGOAT_MAVEN_VERSION=${WEBGOAT_TAG_VERSION:1}" >> $GITHUB_ENV
+
       - name: Build with Maven
-        run: mvn clean install -DskipTests
+        run: |
-  docker:
+          mvn versions:set ${WEBGOAT_VERSION}
-    runs-on: ubuntu-latest
+          mvn clean install -DskipTests
-    needs: build
+
-    steps:
-      - name: "Check out"
-        uses: actions/checkout@v2
-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
-      - name: "Login to dockerhub"
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: "Build and push"
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: docker/Dockerfile
-          push: false #todo enable
-          tags: |
-            webgoat/goatandwolf:${{ steps.tag.outputs.tag }}
-          build-args: |
-            webgoat_version=${{ steps.tag.outputs.tag }}
-  github_release:
-    name: Create Release
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v2
-      - name: "Get tag name"
-        id: tag
-        uses: dawidd6/action-get-tag@v1
       - name: "Create release"
         uses: softprops/action-gh-release@v1
         with:
           draft: false
           files: |
-            webgoat-server/target/*.jar
+            webgoat-server/target/webgoat-server-${WEBGOAT_MAVEN_VERSION}.jar
-            webwolf/target/*.jar
+            webwolf/target/webwolf-${WEBGOAT_MAVEN_VERSION}.jar
-        body: |
+          body: |
-          ## Version 8.
+            ## Version ${{ steps.tag.outputs.tag }}
 
-          ### New functionality
+            ### New functionality
 
-          - test
+            - test
 
-          ### Bug fixes
+            ### Bug fixes
 
-          - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
+            - [#743 - Character encoding errors](https://github.com/WebGoat/WebGoat/issues/743)
 
 
-          ## Contributors
+            ## Contributors
 
-          Special thanks to the following contributors providing us with a pull request:
+            Special thanks to the following contributors providing us with a pull request:
 
-          - Person 1
+            - Person 1
-          - Person 2
+            - Person 2
 
-          And everyone who provided feedback through Github.
+            And everyone who provided feedback through Github.
 
 
-          Team WebGoat
+            Team WebGoat
-        env:
+          env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Create Release
+        - name: "Set up QEMU"
-        id: create_release
+          uses: docker/setup-qemu-action@v1
-        uses: actions/create-release@v1
+        - name: "Set up Docker Buildx"
-        env:
+          uses: docker/setup-buildx-action@v1
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        - name: "Login to dockerhub"
-        with:
+          uses: docker/login-action@v1
-          tag_name: ${{ steps.tag.outputs.tag }}
+          with:
-          release_name: ${{ steps.tag.outputs.tag }}
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
-
+            password: ${{ secrets.DOCKERHUB_TOKEN }}
-          draft: false
+        - name: "Build and push"
-          prerelease: false
+          uses: docker/build-push-action@v2
+          with:
+            context: ./docker
+            file: docker/Dockerfile
+            push: false #todo enable
+            platforms: linux/amd64
+            tags: |
+              webgoat/goatandwolf:${WEBGOAT_TAG_VERSION}
+            # todo webgoat/goatandwolf:latest
+            build-args: |
+              webgoat_version=${WEBGOAT_TAG_VERSION}
+        - name: "Image digest"
+          run: echo ${{ steps.docker_build.outputs.digest }}