cleanup

Author: jaydeluca

.github/workflows/pr-smoke-test-fake-backend-images.yml

@@ -1,15 +1,10 @@
 name: PR build fake backend images for smoke tests
 
 on:
-  push:
-    paths:
-      - "smoke-tests/images/fake-backend/**"
-      - ".github/workflows/pr-smoke-test-fake-backend-images.yml"
   pull_request:
     paths:
       - "smoke-tests/images/fake-backend/**"
       - ".github/workflows/pr-smoke-test-fake-backend-images.yml"
-  workflow_dispatch:
 
 permissions:
   contents: read
@@ -34,7 +29,7 @@ jobs:
         with:
           cache-read-only: true
 
-      - name: Build multi-arch Docker image (without push)
+      - name: Build Docker image
         run: ./gradlew :smoke-tests:images:fake-backend:jibDockerBuild -Djib.httpTimeout=120000 -Djib.console=plain
 
   buildWindows:

.github/workflows/publish-smoke-test-fake-backend-images.yml

@@ -5,6 +5,8 @@ on:
     paths:
       - "smoke-tests/images/fake-backend/**"
       - ".github/workflows/publish-smoke-test-fake-backend-images.yml"
+    branches:
+      - main
   workflow_dispatch:
 
 permissions:
@@ -41,7 +43,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
-      - name: Build and push multi-arch Docker image
+      - name: Build Docker image
         run: ./gradlew :smoke-tests:images:fake-backend:jib -Djib.httpTimeout=120000 -Djib.console=plain -PextraTag=${{ env.TAG }}
 
   publishWindows:
@@ -78,7 +80,7 @@ jobs:
         uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
 
       - name: Build Docker image
-        run: ./gradlew :smoke-tests:images:fake-backend:windowsBackendImageBuild -PextraTag=${{ env.TAG }}
+        run: ./gradlew :smoke-tests:images:fake-backend:dockerPush -PextraTag=${{ env.TAG }}
 
   workflow-notification:
     permissions:

smoke-tests/images/fake-backend/build.gradle.kts

@@ -78,7 +78,7 @@ tasks {
   val dockerPush by registering(DockerPushImage::class) {
     group = "publishing"
     description = "Push all Docker images for the test backend"
-    dependsOn(jib, windowsBackendImageBuild)
+    dependsOn(windowsBackendImageBuild)
     images.add("ghcr.io/$repo/smoke-test-fake-backend-windows:$extraTag")
   }
 }

smoke-tests/images/fake-backend/src/docker/backend/windows.dockerfile

@@ -1,3 +1,3 @@
-FROM eclipse-temurin:11.0.27_6-jdk-windowsservercore-ltsc2022@sha256:5469ceab8d1f5cc620818109fb2e7e2b56bbe010257240348011e16557f9e2b7
+FROM eclipse-temurin:21-jdk-windowsservercore-ltsc2022
 COPY fake-backend.jar /fake-backend.jar
 CMD ["java", "-jar", "/fake-backend.jar"]