chore: use github var for kurrentdb images

w1am · w1am · commit 2180d36f961b · 2025-03-31T18:22:11.000+04:00
diff --git a/.github/workflows/docker-repo.yml b/.github/workflows/docker-repo.yml
diff --git a/.github/workflows/plugins-tests.yml b/.github/workflows/plugins-tests.yml
@@ -8,18 +8,12 @@ on:
         type: string
         default: enterprise
 
-      kdb_version:
+      image:
         required: true
         type: string
 
 jobs:
-  provide_docker:
-    uses: ./.github/workflows/docker-repo.yml
-    with:
-      runtime_env: ${{ inputs.runtime_env }}
-
   single_node:
-    needs: provide_docker
     name: Single Node
 
     strategy:
@@ -32,7 +26,7 @@ jobs:
       - name: Login to Cloudsmith
         uses: docker/login-action@v3
         with:
-          registry: docker.eventstore.com
+          registry: docker.kurrent.io
           username: ${{ secrets.CLOUDSMITH_CICD_USER }}
           password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
 
@@ -57,9 +51,7 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
+          KURRENTDB_IMAGE: ${{ inputs.image }}
           SECURE: true
 
       - uses: actions/upload-artifact@v4
@@ -70,7 +62,6 @@ jobs:
           if-no-files-found: error
 
   cluster:
-    needs: provide_docker
     name: Cluster
 
     strategy:
@@ -95,9 +86,7 @@ jobs:
       - name: Set up cluster with Docker Compose
         run: docker compose up -d
         env:
-          CONTAINER_REGISTRY: docker.eventstore.com
-          CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }}
+          KURRENTDB_IMAGE: ${{ inputs.image }}
 
       - name: Generate user certificates
         run: docker compose --file configure-user-certs-for-tests.yml up
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   publish:
-    name: Publish${{ inputs.dry_run && inputs.dry_run == 'true' && ' (dry run)' || '' }}
+    name: Publish
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -1,12 +1,12 @@
 name: Build and Run Tests
-on: [pull_request]
+on: [ pull_request ]
 jobs:
   build:
     name: Build
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17]
+        java: [ 8, 11, 17 ]
     runs-on: ubuntu-latest
 
     steps:
@@ -31,29 +31,35 @@ jobs:
       - name: Misc tests
         run: ./gradlew ci --tests MiscTests
 
-  tests:
+  ci:
     needs: build
-    name: Tests
+    name: Tests (CI)
+    uses: ./.github/workflows/tests.yml
+    with:
+      image: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES).ci.fullname }}
+    secrets: inherit
 
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [previous-lts, lts, latest, ci]
+  lts:
+    needs: build
+    name: Tests (LTS)
+    uses: ./.github/workflows/tests.yml
+    with:
+      image: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES).lts.fullname }}
+    secrets: inherit
 
+  previous-lts:
+    needs: build
+    name: Tests (Previous LTS)
     uses: ./.github/workflows/tests.yml
     with:
-      kdb_version: ${{ matrix.version }}
+      image: ${{ fromJSON(vars.KURRENTDB_DOCKER_IMAGES)['previous-lts'].fullname }}
+    secrets: inherit
 
   plugins-tests:
     needs: build
     name: Plugins Tests
 
-    strategy:
-      fail-fast: false
-      matrix:
-        version: [24.2.0-jammy]
-
     uses: ./.github/workflows/plugins-tests.yml
     with:
-      kdb_version: ${{ matrix.version }}
+      image: "docker.eventstore.com/eventstore-ee/eventstoredb-commercial:24.2.0-jammy"
     secrets: inherit
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,18 +7,12 @@ on:
         type: string
         default: release
 
-      kdb_version:
+      image:
         required: true
         type: string
 
 jobs:
-  provide_docker:
-    uses: ./.github/workflows/docker-repo.yml
-    with:
-      runtime_env: ${{ inputs.runtime_env }}
-
   single_node:
-    needs: provide_docker
     name: Single node
 
     strategy:
@@ -30,6 +24,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Cloudsmith
+        uses: docker/login-action@v3
+        with:
+          registry: docker.kurrent.io
+          username: ${{ secrets.CLOUDSMITH_CICD_USER }}
+          password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
+
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
@@ -44,9 +45,7 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
+          KURRENTDB_IMAGE: ${{ inputs.image }}
 
       - uses: actions/upload-artifact@v4
         if: failure()
@@ -56,7 +55,6 @@ jobs:
           if-no-files-found: error
 
   secure:
-    needs: provide_docker
     name: Secure
 
     strategy:
@@ -68,6 +66,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Cloudsmith
+        uses: docker/login-action@v3
+        with:
+          registry: docker.kurrent.io
+          username: ${{ secrets.CLOUDSMITH_CICD_USER }}
+          password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
+
       - name: Generate certificates
         run: docker compose --file configure-tls-for-tests.yml up
 
@@ -85,9 +90,7 @@ jobs:
       - name: Execute Gradle build
         run: ./gradlew ci --tests ${{ matrix.test }}Tests
         env:
-          KURRENT_DOCKER_REGISTRY_ENV: docker.eventstore.com
-          KURRENT_DOCKER_IMAGE_ENV: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          KURRENT_DOCKER_TAG_ENV: ${{ inputs.kdb_version }}
+          KURRENTDB_IMAGE: ${{ inputs.image }}
           SECURE: true
 
       - uses: actions/upload-artifact@v4
@@ -97,7 +100,6 @@ jobs:
           path: /tmp/esdb_logs.tar.gz
 
   cluster:
-    needs: provide_docker
     name: Cluster
 
     strategy:
@@ -109,12 +111,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Login to Cloudsmith
+        uses: docker/login-action@v3
+        with:
+          registry: docker.kurrent.io
+          username: ${{ secrets.CLOUDSMITH_CICD_USER }}
+          password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
+
       - name: Set up cluster with Docker Compose
         run: docker compose up -d
         env:
-          CONTAINER_REGISTRY: docker.eventstore.com
-          CONTAINER_IMAGE: ${{ needs.provide_docker.outputs.docker_repo }}/${{ needs.provide_docker.outputs.docker_container }}
-          CONTAINER_IMAGE_VERSION: ${{ inputs.kdb_version }}
+          KURRENTDB_IMAGE: ${{ inputs.image }}
 
       - name: Set up JDK 8
         uses: actions/setup-java@v3
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - volumes-provisioner
 
   esdb-node1: &template
-    image: ${CONTAINER_REGISTRY:-docker.eventstore.com}/${CONTAINER_IMAGE:-eventstore-ce/eventstoredb-ce}:${CONTAINER_IMAGE_VERSION:-latest}
+    image: ${KURRENTDB_IMAGE:-docker.kurrent.io/eventstore/eventstoredb-ee:lts}
     env_file:
       - vars.env
     environment:
diff --git a/src/test/java/io/kurrent/dbclient/DatabaseFactory.java b/src/test/java/io/kurrent/dbclient/DatabaseFactory.java
@@ -36,14 +36,8 @@ public static Database spawnEnterpriseWithPluginsEnabled(String... pluginsToEnab
     private static DockerContainerDatabase.Builder singleNodeBuilder() {
         return DockerContainerDatabase
                 .builder()
-                .registry(Optional
-                        .ofNullable(System.getenv("KURRENT_DOCKER_REGISTRY_ENV"))
-                        .orElse(DockerContainerDatabase.DEFAULT_REGISTRY))
                 .image(Optional
-                        .ofNullable(System.getenv("KURRENT_DOCKER_IMAGE_ENV"))
-                        .orElse(DockerContainerDatabase.DEFAULT_IMAGE))
-                .version(Optional
-                        .ofNullable(System.getenv("KURRENT_DOCKER_TAG_ENV"))
-                        .orElse(DockerContainerDatabase.DEFAULT_VERSION));
+                        .ofNullable(System.getenv("KURRENTDB_IMAGE"))
+                        .orElse(DockerContainerDatabase.DEFAULT_IMAGE));
     }
 }
diff --git a/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java b/src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
@@ -12,22 +12,16 @@
 import java.util.Map;
 
 public class DockerContainerDatabase extends GenericContainer<DockerContainerDatabase> implements Database {
-    public static final String DEFAULT_REGISTRY = "docker.eventstore.com";
     public static final String DEFAULT_IMAGE = "eventstore-ce/eventstoredb-ce";
-    public static final String DEFAULT_VERSION = "latest";
 
     public static class Builder {
-        String registry;
         String image;
-        String version;
         boolean secure;
         boolean anonymous;
         Map<String, String> env;
 
         public Builder() {
-            this.registry = DEFAULT_REGISTRY;
             this.image = DEFAULT_IMAGE;
-            this.version = DEFAULT_VERSION;
             this.env = new HashMap<>();
         }
 
@@ -36,11 +30,6 @@ public Builder secure(boolean secure) {
             return this;
         }
 
-        public Builder version(String version) {
-            this.version = version;
-            return this;
-        }
-
         public Builder anonymous(boolean anonymous) {
             this.anonymous = anonymous;
             return this;
@@ -50,12 +39,6 @@ public Builder image(String image) {
             this.image = image;
             return this;
         }
-
-        public Builder registry(String registry) {
-            this.registry = registry;
-            return this;
-        }
-
         public Builder env(String envVar, String value) {
             this.env.put(envVar, value);
             return this;
@@ -70,7 +53,7 @@ public DockerContainerDatabase build() {
     private final ClientTracker clientTracker;
 
     public DockerContainerDatabase(Builder builder) {
-        super(String.format("%s/%s:%s", builder.registry, builder.image, builder.version));
+        super(builder.image);
         addExposedPorts(1113, 2113);
 
         withEnv("EVENTSTORE_RUN_PROJECTIONS", "ALL");
