From 2253254a75f94d4a5ec285a2d083371915a24bc2 Mon Sep 17 00:00:00 2001 From: YoEight Date: Wed, 14 Feb 2024 14:36:01 -0500 Subject: [PATCH 1/2] Move to Cloudsmith docker registry. --- .github/workflows/pull-request.yml | 1 + .github/workflows/test-dispatch.yml | 1 + .github/workflows/tests.yml | 21 +++++++++++++++++++++ cluster-docker-compose.yml | 6 +++--- esdb/containers_test.go | 2 +- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 06df5c68..07f5b49c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -34,6 +34,7 @@ jobs: uses: ./.github/workflows/tests.yml with: esdb_version: ${{ matrix.version }} + secrets: inherit linting: needs: tests diff --git a/.github/workflows/test-dispatch.yml b/.github/workflows/test-dispatch.yml index 44ca8a6e..42b27448 100644 --- a/.github/workflows/test-dispatch.yml +++ b/.github/workflows/test-dispatch.yml @@ -14,3 +14,4 @@ jobs: uses: ./.github/workflows/tests.yml with: esdb_version: ${{ inputs.version }} + secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bca293b7..9c402632 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,6 +23,13 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} + - 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: Generate certificates run: docker-compose --file docker-compose.yml up @@ -47,6 +54,13 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} + - 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: Generate certificates run: docker-compose --file docker-compose.yml up @@ -72,6 +86,13 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} + - 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: Set up cluster with Docker Compose run: | docker compose -f cluster-docker-compose.yml up -d diff --git a/cluster-docker-compose.yml b/cluster-docker-compose.yml index e014536b..d6d14aed 100644 --- a/cluster-docker-compose.yml +++ b/cluster-docker-compose.yml @@ -26,7 +26,7 @@ services: - volumes-provisioner esdb-node1: - image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest} env_file: - shared.env environment: @@ -47,7 +47,7 @@ services: - cert-gen esdb-node2: - image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest} env_file: - shared.env environment: @@ -68,7 +68,7 @@ services: - cert-gen esdb-node3: - image: ghcr.io/eventstore/eventstore:${EVENTSTORE_DOCKER_TAG_ENV:-latest} + image: docker.eventstore.com/eventstore-ce/eventstoredb-ce:${EVENTSTORE_DOCKER_TAG_ENV:-latest} env_file: - shared.env environment: diff --git a/esdb/containers_test.go b/esdb/containers_test.go index 6a72cdc1..4e67e4aa 100644 --- a/esdb/containers_test.go +++ b/esdb/containers_test.go @@ -42,7 +42,7 @@ type EventStoreDockerConfig struct { } const ( - DEFAULT_EVENTSTORE_DOCKER_REPOSITORY = "ghcr.io/eventstore/testdata" + DEFAULT_EVENTSTORE_DOCKER_REPOSITORY = "docker.eventstore.com/eventstore-utils/testdata" DEFAULT_EVENTSTORE_DOCKER_TAG = "latest" DEFAULT_EVENTSTORE_DOCKER_PORT = "2113" ) From cd2bdf687312b23729e718b74dd56e140f431ce9 Mon Sep 17 00:00:00 2001 From: William Chong Date: Fri, 26 Apr 2024 19:15:37 +0400 Subject: [PATCH 2/2] Remove authenticate step and pull es-gencert-cli from cloudsmith --- .github/workflows/pull-request.yml | 1 - .github/workflows/test-dispatch.yml | 1 - .github/workflows/tests.yml | 21 --------------------- README.md | 2 +- cluster-docker-compose.yml | 2 +- docker-compose.yml | 2 +- 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 07f5b49c..06df5c68 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -34,7 +34,6 @@ jobs: uses: ./.github/workflows/tests.yml with: esdb_version: ${{ matrix.version }} - secrets: inherit linting: needs: tests diff --git a/.github/workflows/test-dispatch.yml b/.github/workflows/test-dispatch.yml index 42b27448..44ca8a6e 100644 --- a/.github/workflows/test-dispatch.yml +++ b/.github/workflows/test-dispatch.yml @@ -14,4 +14,3 @@ jobs: uses: ./.github/workflows/tests.yml with: esdb_version: ${{ inputs.version }} - secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9c402632..bca293b7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,13 +23,6 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} - - 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: Generate certificates run: docker-compose --file docker-compose.yml up @@ -54,13 +47,6 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} - - 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: Generate certificates run: docker-compose --file docker-compose.yml up @@ -86,13 +72,6 @@ jobs: with: go-version: ${{ vars.GO_VERSION }} - - 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: Set up cluster with Docker Compose run: | docker compose -f cluster-docker-compose.yml up -d diff --git a/README.md b/README.md index 73e0357c..4dea7b34 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ make generate-protos-and-build make test ``` -By default the tests use `ghcr.io/eventstore/eventstore:ci`. To override this, set the `EVENTSTORE_DOCKER_TAG_ENV` environment variable to the tag you wish to use: +By default the tests use `docker.eventstore.com/eventstore-ce:ci`. To override this, set the `EVENTSTORE_DOCKER_TAG_ENV` environment variable to the tag you wish to use: ```shell export EVENTSTORE_DOCKER_TAG_ENV="21.10.0-focal" diff --git a/cluster-docker-compose.yml b/cluster-docker-compose.yml index d6d14aed..bba68629 100644 --- a/cluster-docker-compose.yml +++ b/cluster-docker-compose.yml @@ -10,7 +10,7 @@ services: network_mode: none cert-gen: - image: eventstore/es-gencert-cli:1.0.2 + image: docker.eventstore.com/eventstore-utils/es-gencert-cli:latest entrypoint: bash user: "1000:1000" command: > diff --git a/docker-compose.yml b/docker-compose.yml index 62b87287..38a5265c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: network_mode: "none" setup: - image: eventstore/es-gencert-cli:1.0.2 + image: docker.eventstore.com/eventstore-utils/es-gencert-cli:latest entrypoint: bash user: "1000:1000" command: >