From f2fdefd2337c613cc9b3c645e32176521ec403f0 Mon Sep 17 00:00:00 2001 From: YoEight Date: Wed, 14 Feb 2024 17:10:03 -0500 Subject: [PATCH 1/3] Move to Cloudsmith docker registry. --- .github/workflows/base.yml | 10 +++++++++- .github/workflows/ci.yml | 1 + .github/workflows/dispatch.yml | 1 + .github/workflows/lts.yml | 1 + .github/workflows/previous-lts.yml | 1 + .github/workflows/publish.yml | 5 ++++- .../GlobalEnvironment.cs | 2 +- .../docker-compose.cluster.yml | 8 ++++---- .../docker-compose.node.yml | 2 +- test/EventStore.Client.Tests.Common/docker-compose.yml | 8 ++++---- 10 files changed, 27 insertions(+), 12 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index c0c57f739..6b38d5968 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -25,10 +25,18 @@ jobs: - shell: bash run: | git fetch --prune --unshallow + + - name: Login to Cloudsmith + uses: docker/login-action@v3 + with: + registry: docker.eventstore.com + username: ${{ secrets.CLOUDSMITH_CICD_USER }} + password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }} + - name: Pull EventStore Image shell: bash run: | - docker pull ghcr.io/eventstore/eventstore:${{ inputs.docker-tag }} + docker pull docker.eventstore.com/eventstore-ce/eventstoredb-ce:${{ inputs.docker-tag }} - name: Install dotnet SDKs uses: actions/setup-dotnet@v3 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31add45a8..864d6d8a4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,3 +13,4 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: ci + secrets: inherit diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index 927050291..ecb887177 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -13,3 +13,4 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: ${{ inputs.version }} + secrets: inherit diff --git a/.github/workflows/lts.yml b/.github/workflows/lts.yml index fd4e45bb1..405fa4e2b 100644 --- a/.github/workflows/lts.yml +++ b/.github/workflows/lts.yml @@ -13,3 +13,4 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: lts + secrets: inherit diff --git a/.github/workflows/previous-lts.yml b/.github/workflows/previous-lts.yml index c7d16ac1c..711e375b7 100644 --- a/.github/workflows/previous-lts.yml +++ b/.github/workflows/previous-lts.yml @@ -13,3 +13,4 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: previous-lts + secrets: inherit diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 239ea739a..aad29b9f4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -46,7 +46,10 @@ jobs: framework: [ net8.0 ] services: esdb: - image: ghcr.io/eventstore/eventstore:lts + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:lts + credentials: + username: ${{ secrets.CLOUDSMITH_CICD_USER }} + password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }} env: EVENTSTORE_INSECURE: true EVENTSTORE_MEM_DB: false diff --git a/test/EventStore.Client.Tests.Common/GlobalEnvironment.cs b/test/EventStore.Client.Tests.Common/GlobalEnvironment.cs index 57c632154..d7d26dc67 100644 --- a/test/EventStore.Client.Tests.Common/GlobalEnvironment.cs +++ b/test/EventStore.Client.Tests.Common/GlobalEnvironment.cs @@ -22,7 +22,7 @@ static void EnsureDefaults(IConfiguration configuration) { configuration.EnsureValue("ES_USE_CLUSTER", "false"); configuration.EnsureValue("ES_USE_EXTERNAL_SERVER", "false"); - configuration.EnsureValue("ES_DOCKER_REGISTRY", "ghcr.io/eventstore/eventstore"); + configuration.EnsureValue("ES_DOCKER_REGISTRY", "docker.eventstore.com/eventstore-ce/eventstoredb-ce"); configuration.EnsureValue("ES_DOCKER_TAG", "ci"); configuration.EnsureValue("ES_DOCKER_IMAGE", $"{configuration["ES_DOCKER_REGISTRY"]}:{configuration["ES_DOCKER_TAG"]}"); diff --git a/test/EventStore.Client.Tests.Common/docker-compose.cluster.yml b/test/EventStore.Client.Tests.Common/docker-compose.cluster.yml index 2c92d5162..b13b1e341 100644 --- a/test/EventStore.Client.Tests.Common/docker-compose.cluster.yml +++ b/test/EventStore.Client.Tests.Common/docker-compose.cluster.yml @@ -40,7 +40,7 @@ services: - cert-gen esdb-node1: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node1 env_file: - shared.env @@ -69,7 +69,7 @@ services: - cert-gen esdb-node2: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node2 env_file: - shared.env @@ -98,7 +98,7 @@ services: - cert-gen esdb-node3: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node3 env_file: - shared.env @@ -127,7 +127,7 @@ services: - cert-gen esdb-node4: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node4 env_file: - shared.env diff --git a/test/EventStore.Client.Tests.Common/docker-compose.node.yml b/test/EventStore.Client.Tests.Common/docker-compose.node.yml index a6997819a..63238270a 100644 --- a/test/EventStore.Client.Tests.Common/docker-compose.node.yml +++ b/test/EventStore.Client.Tests.Common/docker-compose.node.yml @@ -7,7 +7,7 @@ networks: services: eventstore: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: eventstore environment: - EVENTSTORE_MEM_DB=true diff --git a/test/EventStore.Client.Tests.Common/docker-compose.yml b/test/EventStore.Client.Tests.Common/docker-compose.yml index 610a27445..0f8e43094 100644 --- a/test/EventStore.Client.Tests.Common/docker-compose.yml +++ b/test/EventStore.Client.Tests.Common/docker-compose.yml @@ -40,7 +40,7 @@ services: - cert-gen esdb-node1: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node1 env_file: - shared.env @@ -69,7 +69,7 @@ services: - cert-gen esdb-node2: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node2 env_file: - shared.env @@ -98,7 +98,7 @@ services: - cert-gen esdb-node3: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node3 env_file: - shared.env @@ -127,7 +127,7 @@ services: - cert-gen esdb-node4: - image: ghcr.io/eventstore/eventstore:${ES_DOCKER_TAG} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${ES_DOCKER_TAG} container_name: esdb-node4 env_file: - shared.env From f6ffb5e8563eb3b55769dacd473276cc3decfc3c Mon Sep 17 00:00:00 2001 From: Joseph Cummings Date: Fri, 26 Apr 2024 12:51:43 +0100 Subject: [PATCH 2/3] No longer necessary to authenticate against the Cloudsmith registry --- .github/workflows/base.yml | 8 -------- .github/workflows/ci.yml | 1 - .github/workflows/dispatch.yml | 1 - .github/workflows/lts.yml | 1 - .github/workflows/previous-lts.yml | 1 - .github/workflows/publish.yml | 3 --- 6 files changed, 15 deletions(-) diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 6b38d5968..b3a717aed 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -25,14 +25,6 @@ jobs: - shell: bash run: | git fetch --prune --unshallow - - - name: Login to Cloudsmith - uses: docker/login-action@v3 - with: - registry: docker.eventstore.com - username: ${{ secrets.CLOUDSMITH_CICD_USER }} - password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }} - - name: Pull EventStore Image shell: bash run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 864d6d8a4..31add45a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,4 +13,3 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: ci - secrets: inherit diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index ecb887177..927050291 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -13,4 +13,3 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: ${{ inputs.version }} - secrets: inherit diff --git a/.github/workflows/lts.yml b/.github/workflows/lts.yml index 405fa4e2b..fd4e45bb1 100644 --- a/.github/workflows/lts.yml +++ b/.github/workflows/lts.yml @@ -13,4 +13,3 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: lts - secrets: inherit diff --git a/.github/workflows/previous-lts.yml b/.github/workflows/previous-lts.yml index 711e375b7..c7d16ac1c 100644 --- a/.github/workflows/previous-lts.yml +++ b/.github/workflows/previous-lts.yml @@ -13,4 +13,3 @@ jobs: uses: ./.github/workflows/base.yml with: docker-tag: previous-lts - secrets: inherit diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aad29b9f4..dcfe77221 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -47,9 +47,6 @@ jobs: services: esdb: image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:lts - credentials: - username: ${{ secrets.CLOUDSMITH_CICD_USER }} - password: ${{ secrets.CLOUDSMITH_CICD_TOKEN }} env: EVENTSTORE_INSECURE: true EVENTSTORE_MEM_DB: false From 366a60258d89db20f6c35e13fec2a50b62f7c908 Mon Sep 17 00:00:00 2001 From: Joseph Cummings Date: Fri, 26 Apr 2024 12:54:42 +0100 Subject: [PATCH 3/3] Update samples to point to Cloudsmith registry --- samples/quick-start/docker-compose.yml | 2 +- samples/secure-with-tls/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/quick-start/docker-compose.yml b/samples/quick-start/docker-compose.yml index f6621fd78..4e5df1738 100644 --- a/samples/quick-start/docker-compose.yml +++ b/samples/quick-start/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.5' services: eventstore: - image: eventstore/eventstore:latest + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:latest environment: EVENTSTORE_INSECURE: true EVENTSTORE_MEM_DB: false diff --git a/samples/secure-with-tls/docker-compose.yml b/samples/secure-with-tls/docker-compose.yml index f1078440f..d92ecbe5c 100644 --- a/samples/secure-with-tls/docker-compose.yml +++ b/samples/secure-with-tls/docker-compose.yml @@ -7,7 +7,7 @@ networks: services: eventstore: - image: eventstore/eventstore:latest + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:latest container_name: eventstore environment: - EVENTSTORE_MEM_DB=true