From 314db9654a854bd656ec19aa2ebd1260cefa81ba Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 25 May 2026 16:52:09 -0700 Subject: [PATCH] Use harbor proxy Signed-off-by: Bryan Frimin --- .github/workflows/make.yaml | 8 +++----- compose.prod.yaml | 6 +++--- compose.yaml | 16 ++++++++-------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/make.yaml b/.github/workflows/make.yaml index 68d4725f9..56eebf7b4 100644 --- a/.github/workflows/make.yaml +++ b/.github/workflows/make.yaml @@ -357,8 +357,6 @@ jobs: runs-on: "runs-on=${{ github.run_id }}/runner=4cpu-linux-x64/extras=s3-cache" permissions: contents: "read" - env: - HAS_DOCKER_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN != '' }} steps: - uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd" # v6 with: @@ -367,10 +365,10 @@ jobs: - uses: "./.github/actions/setup" - uses: "docker/setup-compose-action@8cccb8c14b6500aaffebff1aa49c502c34d2e5e6" # v2.1.0 - uses: "docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121" # v4.1.0 - if: env.HAS_DOCKER_TOKEN == 'true' with: - username: "gearnode" - password: ${{ secrets.DOCKER_HUB_TOKEN }} + registry: artifact.probo.inc + username: ${{ secrets.HARBOR_USERNAME }} + password: ${{ secrets.HARBOR_PASSWORD }} - name: "Install mkcert" run: | go install filippo.io/mkcert@latest diff --git a/compose.prod.yaml b/compose.prod.yaml index bcb03dfa7..be00e0d12 100644 --- a/compose.prod.yaml +++ b/compose.prod.yaml @@ -56,7 +56,7 @@ services: postgres: - image: "postgres:17.9@sha256:7ad98329d513dd497293b951c195ca354274a77f12ddbbbbf85e68a811823d72" + image: "artifact.probo.inc/dockerhub/library/postgres@sha256:7ad98329d513dd497293b951c195ca354274a77f12ddbbbbf85e68a811823d72" shm_size: "1g" command: > postgres -c "shared_buffers=4GB" @@ -77,7 +77,7 @@ services: retries: 5 seaweedfs: - image: "chrislusf/seaweedfs:4.20@sha256:cea8339d21dad1b200adce581dd7434d254b8f5975f142c3b4c930ba78647eef" + image: "artifact.probo.inc/dockerhub/chrislusf/seaweedfs@sha256:cea8339d21dad1b200adce581dd7434d254b8f5975f142c3b4c930ba78647eef" command: > server -s3 @@ -95,7 +95,7 @@ services: - "seaweedfs-data:/data:rw" chrome: - image: "chromedp/headless-shell:149.0.7779.3@sha256:b24482ae166e2c67135f5a8ba9575c257efdd8e2fd6b2e931f9d88ede3d72f3b" + image: "artifact.probo.inc/dockerhub/chromedp/headless-shell@sha256:b24482ae166e2c67135f5a8ba9575c257efdd8e2fd6b2e931f9d88ede3d72f3b" ports: - "9222:9222" command: diff --git a/compose.yaml b/compose.yaml index bb18d22db..142a5be13 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: postgres: - image: "postgres:18.3@sha256:52e6ffd11fddd081ae63880b635b2a61c14008c17fc98cdc7ce5472265516dd0" + image: "artifact.probo.inc/dockerhub/library/postgres@sha256:52e6ffd11fddd081ae63880b635b2a61c14008c17fc98cdc7ce5472265516dd0" pull_policy: missing shm_size: "1g" command: > @@ -22,7 +22,7 @@ services: retries: 5 seaweedfs: - image: "chrislusf/seaweedfs:4.20@sha256:cea8339d21dad1b200adce581dd7434d254b8f5975f142c3b4c930ba78647eef" + image: "artifact.probo.inc/dockerhub/chrislusf/seaweedfs@sha256:cea8339d21dad1b200adce581dd7434d254b8f5975f142c3b4c930ba78647eef" pull_policy: missing command: > server @@ -41,7 +41,7 @@ services: - "seaweedfs-data:/data:rw" grafana: - image: "grafana/grafana:13.0.0@sha256:a03d9e604e4dba58c5e64458a879701f46ef64af1f596058aacfad9aacdcab34" + image: "artifact.probo.inc/dockerhub/grafana/grafana@sha256:a03d9e604e4dba58c5e64458a879701f46ef64af1f596058aacfad9aacdcab34" pull_policy: missing ports: - "3001:3000" @@ -55,7 +55,7 @@ services: GF_USERS_DEFAULT_THEME: "light" prometheus: - image: "prom/prometheus:v3.11.2@sha256:5550dc63da361dc30f6fe02ac0e4dfc736ededfef3c8d12a634db04a67824d78" + image: "artifact.probo.inc/dockerhub/prom/prometheus@sha256:5550dc63da361dc30f6fe02ac0e4dfc736ededfef3c8d12a634db04a67824d78" pull_policy: missing volumes: - "./compose/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml" @@ -72,7 +72,7 @@ services: - "9191:9191" loki: - image: "grafana/loki:3.7.1@sha256:73e905b51a7f917f7a1075e4be68759df30226e03dcb3cd2213b989cc0dc8eb4" + image: "artifact.probo.inc/dockerhub/grafana/loki@sha256:73e905b51a7f917f7a1075e4be68759df30226e03dcb3cd2213b989cc0dc8eb4" pull_policy: missing ports: - "3100:3100" @@ -80,7 +80,7 @@ services: - "-config.file=/etc/loki/local-config.yaml" tempo: - image: "grafana/tempo:2.10.4@sha256:a6616c9d224770c883a67b50e4941e99c5df81b076ef05f516bb7cce5a96cec0" + image: "artifact.probo.inc/dockerhub/grafana/tempo@sha256:a6616c9d224770c883a67b50e4941e99c5df81b076ef05f516bb7cce5a96cec0" pull_policy: missing command: - "-config.file=/etc/tempo.yaml" @@ -93,7 +93,7 @@ services: - "tempo-data:/var/tempo:rw" mailpit: - image: "axllent/mailpit:v1.29.6@sha256:0b5c5f7ffd3c93474baa7fd3869c1462e5a3d03256ed0933dfc0e7d81d794036" + image: "artifact.probo.inc/dockerhub/axllent/mailpit@sha256:0b5c5f7ffd3c93474baa7fd3869c1462e5a3d03256ed0933dfc0e7d81d794036" pull_policy: missing ports: - "1025:1025" # SMTP server @@ -106,7 +106,7 @@ services: - "MP_SMTP_AUTH_ALLOW_INSECURE=true" chrome: - image: "chromedp/headless-shell:149.0.7779.3@sha256:b24482ae166e2c67135f5a8ba9575c257efdd8e2fd6b2e931f9d88ede3d72f3b" + image: "artifact.probo.inc/dockerhub/chromedp/headless-shell@sha256:b24482ae166e2c67135f5a8ba9575c257efdd8e2fd6b2e931f9d88ede3d72f3b" pull_policy: missing ports: - "9222:9222"