diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index ee2696660ab..d8465618e55 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -294,6 +294,23 @@ jobs: name: integration-tests-${{ matrix.arch }} - name: Extract Integration Tests Archive run: tar -xzvf integration-tests-${{ matrix.arch }}.tar.gz + - name: Login to Docker Hub + # Preload Images still pulls consul, memcached, redis and postgres from Docker Hub. #7464 + # dropped the Install Docker Client step from this job, and with it the `docker login` that + # script performs, so those pulls have been anonymous ever since and are exposed to the + # anonymous rate limit. Authenticate here, as the build job already does. + # + # The secret is empty on pull requests from forks, so skip the login there and let the pulls + # stay anonymous rather than failing the step outright. + env: + DOCKER_REGISTRY_USER: ${{ secrets.DOCKER_REGISTRY_USER }} + DOCKER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD }} + run: | + if [ -z "${DOCKER_REGISTRY_PASSWORD:-}" ]; then + echo "No Docker Hub credentials available (fork pull request); pulling anonymously." + exit 0 + fi + docker login -u "$DOCKER_REGISTRY_USER" -p "$DOCKER_REGISTRY_PASSWORD" - name: Preload Images # We download docker images used by integration tests so that all images are available # locally and the download time doesn't account in the test execution time, which is subject @@ -317,7 +334,7 @@ jobs: done } - retry docker pull minio/minio:RELEASE.2024-05-28T17-19-04Z + retry docker pull quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z retry docker pull consul:1.8.4 retry docker pull quay.io/coreos/etcd:v3.5.29 if [ "$TEST_TAGS" = "integration_backward_compatibility" ]; then diff --git a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml index 455a3e1f7ae..0bfbc0f6c1d 100644 --- a/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-gossip/docker-compose.yml @@ -8,7 +8,7 @@ services: - 8500:8500 minio: - image: minio/minio + image: quay.io/minio/minio command: [ "server", "/data" ] environment: - MINIO_ACCESS_KEY=cortex diff --git a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml index 4e6b396d194..ea247084cfa 100644 --- a/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3-single-binary/docker-compose.yml @@ -8,7 +8,7 @@ services: - 8500:8500 minio: - image: minio/minio + image: quay.io/minio/minio command: [ "server", "/data" ] environment: - MINIO_ACCESS_KEY=cortex diff --git a/development/tsdb-blocks-storage-s3/docker-compose.yml b/development/tsdb-blocks-storage-s3/docker-compose.yml index 5bb3a9d3708..54d819d745d 100644 --- a/development/tsdb-blocks-storage-s3/docker-compose.yml +++ b/development/tsdb-blocks-storage-s3/docker-compose.yml @@ -8,7 +8,7 @@ services: - 8500:8500 minio: - image: minio/minio + image: quay.io/minio/minio command: [ "server", "/data" ] environment: - MINIO_ACCESS_KEY=cortex diff --git a/integration/e2e/images/images.go b/integration/e2e/images/images.go index aeb5858974e..c2714676b14 100644 --- a/integration/e2e/images/images.go +++ b/integration/e2e/images/images.go @@ -8,7 +8,7 @@ package images var ( Memcached = "memcached:1.6.1" Redis = "docker.io/redis:7.0.4-alpine" - Minio = "minio/minio:RELEASE.2024-05-28T17-19-04Z" + Minio = "quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z" Consul = "consul:1.8.4" ETCD = "quay.io/coreos/etcd:v3.5.29" Prometheus = "quay.io/prometheus/prometheus:v3.9.1"