Update CI

RakambdaOrg · Jul 20, 2023 · f21f140 · f21f140
1 parent 38def42
commit f21f140
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -200,9 +200,9 @@ jobs:
         with:
           arguments: |
             :miner:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}
 
   publish-viewer:
     name: Publish Viewer on DockerHub
@@ -226,6 +226,6 @@ jobs:
         with:
           arguments: |
             :viewer:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}
diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml
@@ -27,18 +27,18 @@ jobs:
         with:
           arguments: |
             :miner:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_MINER_IMAGE_NAME}:${GITHUB_REF##*/}
       - name: Push latest on Docker Hub
         if: success() && github.ref == 'refs/heads/main'
         uses: gradle/gradle-build-action@v2
         with:
           arguments: |
             :miner:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_MINER_IMAGE_NAME}:latest"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_MINER_IMAGE_NAME}:latest
 
   publish-viewer:
     name: Publish Viewer on DockerHub
@@ -58,15 +58,15 @@ jobs:
         with:
           arguments: |
             :viewer:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_VIEWER_IMAGE_NAME}:${GITHUB_REF##*/}
       - name: Push latest on Docker Hub
         if: success() && github.ref == 'refs/heads/main'
         uses: gradle/gradle-build-action@v2
         with:
           arguments: |
             :viewer:jib
-            -Dorg.gradle.project.dockerUsername="${{ secrets.DOCKER_USERNAME }}"
-            -Dorg.gradle.project.dockerPassword="${{ secrets.DOCKER_TOKEN }}"
-            -Djib.to.image="${DOCKER_VIEWER_IMAGE_NAME}:latest"
+            -DdockerUsername=${{ secrets.DOCKER_USERNAME }}
+            -DdockerPassword=${{ secrets.DOCKER_TOKEN }}
+            -Djib.to.image=${DOCKER_VIEWER_IMAGE_NAME}:latest