Set up jib differently

DonRobo · Jul 7, 2024 · 1c4b776 · 1c4b776
1 parent 63c799f
commit 1c4b776
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -37,8 +37,8 @@ jobs:
           GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REF: ${{ github.ref }}
 
-      - name: Log in to Docker registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
       - name: Publish container images
-        run: ./gradlew jib -Djib.serialize=true --image=ghcr.io/home-former:${{ github.sha }}
+        run: ./gradlew jib
+        env:
+          GPR_USER: ${{ github.actor }}
+          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/web/build.gradle.kts b/web/build.gradle.kts
@@ -46,4 +46,11 @@ jib {
 //            }
         }
     }
+    to {
+        image = "ghcr.io/DonRobo/home-former"
+        auth {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GH_USER")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("GH_TOKEN")
+        }
+    }
 }