push images to GitHub Container Registry

.github/workflows/build.yml

@@ -27,6 +27,9 @@ jobs:
       DEFAULT_NODE_VERSION: "18"
 
     steps:
+      - name: Inject slug/short variables
+        uses: rlespinasse/github-slug-action@v4
+
       - name: About env
         run: |
           echo "Env"

build.gradle

@@ -1,4 +1,5 @@
 import com.github.spotbugs.snom.SpotBugsTask
+import io.zucchini.build.docker.DockerExtension
 import io.zucchini.build.docker.DockerPlugin
 import io.zucchini.build.node.NodePlugin
 import io.zucchini.build.node.YarnTask
@@ -47,22 +48,6 @@ allprojects {
         mavenCentral()
     }
 
-    ext.getDockerTags = {
-        List<String> dockerTags = []
-
-        // Branch slug, without special characters
-        String branchName = project.grgit.branch.current().name
-        String branchSlug = branchName.replace('/', '-')
-
-        // If the Git branch is the master branch, then the Docker image will be tagged "latest"
-        dockerTags << "branch-${branchSlug}"
-        if (branchName == 'master') {
-            dockerTags << 'latest'
-        }
-
-        return dockerTags
-    }
-
     // Plugins to use with the java plugin
 
     afterEvaluate {
@@ -125,6 +110,23 @@ allprojects {
 
         }
 
+        // Shared Docker config
+        DockerExtension dockerExtension = project.getExtensions().findByType(DockerExtension.class)
+        if (dockerExtension) {
+            dockerExtension.repositories << (project.properties['docker.baseRepository'] as String)
+            dockerExtension.repositories << (project.properties['docker.publishRepository'] as String)
+
+            // If the Git branch is the master branch, then the Docker image will be tagged "latest"
+            String branchName = project.grgit.branch.current().name
+            if (branchName == 'master') {
+                dockerExtension.tags << 'latest'
+            } else {
+                // Branch slug, without special characters
+                String branchSlug = branchName.replace('/', '-')
+                dockerExtension.tags << "branch-${branchSlug}"
+            }
+        }
+
         // Shared Java compiler config
         project.tasks.withType(JavaCompile) {
             options.release = 17
@@ -299,7 +301,6 @@ project("${rootProject.name}-app") {
 
     docker {
         name = rootProject.name
-        tags += project.getDockerTags()
     }
 
     task copyLibraries(type: Sync) {
@@ -407,13 +408,7 @@ project("${rootProject.name}-example-features") {
 }
 
 
-project("${rootProject.name}-mongo") {
-
-    docker {
-        tags += project.getDockerTags()
-    }
-
-}
+project("${rootProject.name}-mongo")
 
 
 project("${rootProject.name}-e2e-tests") {

buildSrc/src/main/groovy/io/zucchini/build/docker/DockerComposeExtension.groovy

@@ -1,6 +1,5 @@
 package io.zucchini.build.docker
 
-import groovy.transform.PackageScope
 import org.gradle.api.Project
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
@@ -17,7 +16,6 @@ class DockerComposeExtension {
     }
 
     void environment(String name, String value) {
-        System.stdout.println("Adding ${name} with value ${value}");
         env.put(name, value)
     }
 

buildSrc/src/main/groovy/io/zucchini/build/docker/DockerExtension.groovy

@@ -10,26 +10,26 @@ class DockerExtension {
 
     String name
 
-    String repository
+    @Input
+    @Optional
+    List<String> repositories = []
 
     @Input
     @Optional
     List<String> tags = []
 
     DockerExtension(Project project) {
-        repository = project.properties['docker.baseRepository']
         name = project.name
         tags << (project.version as String)
     }
 
-    void tag(String tag) {
-        tags << tag
-    }
-
     @PackageScope
     List<String> getFullTags() {
-        String fullName = repository == null ? name : "${repository}/${name}"
-        return tags.collect { "${fullName}:${it}" }
+        return repositories
+            .collect { repository ->
+                tags.collect { tag -> "$repository/${name}:$tag" }
+            }
+            .flatten()
     }
 
 }

docker-compose.yml

@@ -5,14 +5,14 @@ version: "3"
 services:
 
   mongo:
-    image: "pgentile/zucchini-ui-mongo:${ZUCCHINI_VERSION:-latest}"
+    image: "ghcr.io/pgentile/zucchini-ui-mongo:${ZUCCHINI_VERSION:-latest}"
     ports:
       - "27017:27017"
     networks:
       - mongo
 
   zucchini-ui:
-    image: "pgentile/zucchini-ui:${ZUCCHINI_VERSION:-latest}"
+    image: "ghcr.io/pgentile/zucchini-ui:${ZUCCHINI_VERSION:-latest}"
     ports:
       - "8080:8080"
       - "8081:8081"

gradle.properties

@@ -1,3 +1,4 @@
 version = 0.0.6-SNAPSHOT
 
-docker.baseRepository = pgentile
+docker.baseRepository = ghcr.io/pgentile
+docker.publishRepository = pgentile

zucchini-ui-frontend/yarn.lock

@@ -3427,9 +3427,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^5.2.2:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.3.1.tgz#eb94413789daec0f0ebe2fcc230bdc9d7c91b43d"
-  integrity sha512-spBwIj0TK0Ey3666GwIdWVfUpLyubpU53BTCu8iPn4r4oXd9O14Hjg3EHw3ts2oed77/SeckunUYCyRlSngqHw==
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"