From 564ef48d026ea1588319b032a26a41105a470c96 Mon Sep 17 00:00:00 2001 From: merlin Date: Thu, 5 Mar 2026 19:45:17 +0800 Subject: [PATCH] chore: change related images to fit new server system --- .gitea/workflows/dev.yaml | 6 +++--- dev-rabbitmq.yaml | 4 ++-- dev-redis.yaml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index c5a9784..d06b8d6 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -9,7 +9,7 @@ jobs: deploy: runs-on: gitea-runner-group-myplayer container: - image: harbor.merlin.xin/release/merlin/action_deployer:v0.0.1 + image: ${{ vars.HARBOR_URL }}/candlelight/action_deployer:v0.0.1 steps: - name: Checkout code uses: actions/checkout@v4 @@ -29,5 +29,5 @@ jobs: env: PROJECT_NAME: ${{ vars.PROJECT_NAME }} run: | - helm upgrade --install ${PROJECT_NAME}-dev-rabbitmq oci://harbor.merlin.xin/charts/bitnamicharts/rabbitmq --version 16.0.14 --namespace testing --values dev-rabbitmq.yaml - helm upgrade --install ${PROJECT_NAME}-dev-redis oci://harbor.merlin.xin/charts/bitnamicharts/redis --version 24.1.3 --namespace testing --values dev-redis.yaml \ No newline at end of file + helm upgrade --install ${PROJECT_NAME}-dev-rabbitmq oci://registry.merlin.xin/charts/bitnamicharts/rabbitmq --version 16.0.14 --namespace testing --values dev-rabbitmq.yaml + helm upgrade --install ${PROJECT_NAME}-dev-redis oci://registry.merlin.xin/charts/bitnamicharts/redis --version 24.1.3 --namespace testing --values dev-redis.yaml \ No newline at end of file diff --git a/dev-rabbitmq.yaml b/dev-rabbitmq.yaml index b8b4b83..8890703 100644 --- a/dev-rabbitmq.yaml +++ b/dev-rabbitmq.yaml @@ -3,8 +3,8 @@ global: allowInsecureImages: true image: - registry: harbor.merlin.xin - repository: mirrors/docker.io/bitnamilegacy/rabbitmq + registry: registry.merlin.xin + repository: mirrors/bitnamilegacy/rabbitmq tag: 4.1.3-debian-12-r1 resources: diff --git a/dev-redis.yaml b/dev-redis.yaml index dc153c3..e33906b 100644 --- a/dev-redis.yaml +++ b/dev-redis.yaml @@ -3,14 +3,14 @@ global: allowInsecureImages: true image: - registry: harbor.merlin.xin - repository: mirrors/docker.io/bitnamilegacy/redis + registry: registry.merlin.xin + repository: mirrors/bitnamilegacy/redis tag: 8.2.1-debian-12-r0 kubectl: image: registry: harbor.merlin.xin - repository: mirrors/docker.io/bitnamilegacy/kubectl + repository: mirrors/bitnamilegacy/kubectl tag: 1.33.4-debian-12-r0 architecture: standalone