[CI] Change to docker/build-push-action@v6

spring-cloud · Jul 5, 2024 · 25ab1a3 · 25ab1a3
1 parent 4254ed6
commit 25ab1a3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/build-uaa-test.yml b/.github/workflows/build-uaa-test.yml
@@ -19,17 +19,23 @@ jobs:
         with:
           java-version: '8'
           distribution: 'liberica'
-      - name: Login dockerhub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build UAA Test Image
         shell: bash
         env:
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: ./src/docker/uaa/build-all
+        path: ./src/docker/uaa
+        run: ./build-uaa
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login dockerhub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Publish Test Image
-        shell: bash
-        run: docker push spring-cloud/scdf-uaa-test:4.32
+        uses: docker/build-push-action@v6
+        with:
+          context: src/docker/uaa
+          push: true
+          tags: spring-cloud/scdf-uaa-test:4.32
diff --git a/src/docker/uaa/build-uaa b/src/docker/uaa/build-uaa
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 if [ ! -d uaa ]; then
   git clone --branch 4.32.0 https://github.com/cloudfoundry/uaa.git
 fi
@@ -7,6 +8,6 @@ if ((HAS_CRED == 0)); then
   cat ./build-script.gradle.fragment >> uaa/settings.gradle
 fi
 pushd uaa
-  ./gradlew clean build -x test
+  ./gradlew clean :cloudfoundry-identity-uaa:assemble
 popd
 cp uaa/uaa/build/libs/cloudfoundry-identity-uaa-*.war ./cloudfoundry-identity-uaa.war