From 100e5a154d7d5bc831c520ad0e183468642ef968 Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Tue, 26 May 2026 14:20:28 -0700 Subject: [PATCH] Fix docker hub rate limit Signed-off-by: Bryan Frimin --- .github/workflows/make.yaml | 5 ++++- compose.github-action.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 compose.github-action.yaml diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml index 56eebf7b4..30bf82a64 100644 --- a/.github/workflows/make.yaml +++ b/.github/workflows/make.yaml @@ -355,6 +355,9 @@ jobs: test-e2e: name: "test-e2e" runs-on: "runs-on=${{ github.run_id }}/runner=4cpu-linux-x64/extras=s3-cache" + env: + COMPOSE_FILE: "compose.yaml:compose.github-action.yaml" + DOCKER_COMPOSE_FLAGS: "-f compose.github-action.yaml" permissions: contents: "read" steps: @@ -378,7 +381,7 @@ jobs: uses: "runs-on/cache@a5f51d6f3fece787d03b7b4e981c82538a0654ed" # v4 with: path: /tmp/docker-images - key: "docker-images-${{ hashFiles('compose.yaml') }}" + key: "docker-images-${{ hashFiles('compose.yaml', 'compose.github-action.yaml') }}" - name: "Load cached Docker images" if: steps.docker-cache.outputs.cache-hit == 'true' run: "docker load -i /tmp/docker-images/images.tar" diff --git a/compose.github-action.yaml b/compose.github-action.yaml new file mode 100644 index 000000000..15f60aa5f --- /dev/null +++ b/compose.github-action.yaml @@ -0,0 +1,30 @@ +# CI-only compose override: pull Docker Hub images through the Harbor proxy +# cache (artifact.probo.inc/dockerhub). Used with compose.yaml in GitHub Actions. +# +# Harbor resolves digest refs as @sha256:..., not :tag@sha256:... +# Images from other registries (ghcr.io, quay.io) are unchanged in compose.yaml. + +services: + postgres: + image: "artifact.probo.inc/dockerhub/library/postgres@sha256:52e6ffd11fddd081ae63880b635b2a61c14008c17fc98cdc7ce5472265516dd0" + + seaweedfs: + image: "artifact.probo.inc/dockerhub/chrislusf/seaweedfs@sha256:cea8339d21dad1b200adce581dd7434d254b8f5975f142c3b4c930ba78647eef" + + grafana: + image: "artifact.probo.inc/dockerhub/grafana/grafana@sha256:a03d9e604e4dba58c5e64458a879701f46ef64af1f596058aacfad9aacdcab34" + + prometheus: + image: "artifact.probo.inc/dockerhub/prom/prometheus@sha256:5550dc63da361dc30f6fe02ac0e4dfc736ededfef3c8d12a634db04a67824d78" + + loki: + image: "artifact.probo.inc/dockerhub/grafana/loki@sha256:73e905b51a7f917f7a1075e4be68759df30226e03dcb3cd2213b989cc0dc8eb4" + + tempo: + image: "artifact.probo.inc/dockerhub/grafana/tempo@sha256:a6616c9d224770c883a67b50e4941e99c5df81b076ef05f516bb7cce5a96cec0" + + mailpit: + image: "artifact.probo.inc/dockerhub/axllent/mailpit@sha256:0b5c5f7ffd3c93474baa7fd3869c1462e5a3d03256ed0933dfc0e7d81d794036" + + chrome: + image: "artifact.probo.inc/dockerhub/chromedp/headless-shell@sha256:b24482ae166e2c67135f5a8ba9575c257efdd8e2fd6b2e931f9d88ede3d72f3b"