Merge branch 'master' of github.com:bshp/firefly

# Conflicts: # .github/workflows/build.yml
bshp · Jan 23, 2024 · 9618465 · 9618465
2 parents 96a759e + aadf6f5
commit 9618465
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,20 +19,20 @@ jobs:
         DOCKER_TOKEN: ${{secrets.DOCKER_TOKEN}}
       run: |
         docker login -u $DOCKER_USER -p $DOCKER_TOKEN
-    - name: Build v8
+    - name: Build v9.8
       run: docker build . --pull --tag bshp/firefly:v9.8 --build-arg VERSION=22.04 --build-arg TOMCAT_VERSION=9 --build-arg JAVA_VERSION=8 --no-cache
-    - name: Push v8
+    - name: Push v9.8
       run: |
         docker push bshp/firefly:v9.8
-    - name: Build v9
+    - name: Build v9.11
       run: docker build . --pull --tag bshp/firefly:latest --build-arg VERSION=22.04 --build-arg TOMCAT_VERSION=9 --no-cache
-    - name: Push v9
+    - name: Push v9.11
       run: |
         docker tag bshp/firefly:latest bshp/firefly:v9.11
         docker push bshp/firefly:latest
         docker push bshp/firefly:v9.11
-    - name: Build v10
+    - name: Build v10.17
       run: docker build . --pull --tag bshp/firefly:v10.17 --build-arg VERSION=22.04 --build-arg TOMCAT_VERSION=10 --no-cache
-    - name: Push v10
+    - name: Push v10.17
       run: |
         docker push bshp/firefly:v10.17