From e595885dc6a128f2268645eb537c958d6fff93f9 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 1 Sep 2025 19:07:26 +0800 Subject: [PATCH] chore: use greptime dockerhub image (#6865) Signed-off-by: liyang --- .github/actions/setup-etcd-cluster/action.yml | 4 ++-- .github/actions/setup-kafka-cluster/action.yml | 4 ++-- .github/actions/setup-postgres-cluster/action.yml | 4 ++-- .github/scripts/pull-test-deps-images.sh | 10 +++++----- tests-integration/fixtures/docker-compose.yml | 12 ++++++------ tests/conf/kafka-cluster.yml | 2 +- tests/runner/src/util.rs | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/actions/setup-etcd-cluster/action.yml b/.github/actions/setup-etcd-cluster/action.yml index 886880dd20..9c882983be 100644 --- a/.github/actions/setup-etcd-cluster/action.yml +++ b/.github/actions/setup-etcd-cluster/action.yml @@ -25,8 +25,8 @@ runs: --set persistence.size=2Gi \ --create-namespace \ --set global.security.allowInsecureImages=true \ - --set image.registry=public.ecr.aws/i8k6a5e1 \ - --set image.repository=bitnami/etcd \ + --set image.registry=docker.io \ + --set image.repository=greptime/etcd \ --set image.tag=3.6.1-debian-12-r3 \ --version 12.0.8 \ -n ${{ inputs.namespace }} diff --git a/.github/actions/setup-kafka-cluster/action.yml b/.github/actions/setup-kafka-cluster/action.yml index 3eeb13f4d7..fca420da70 100644 --- a/.github/actions/setup-kafka-cluster/action.yml +++ b/.github/actions/setup-kafka-cluster/action.yml @@ -23,8 +23,8 @@ runs: --set listeners.controller.protocol=PLAINTEXT \ --set listeners.client.protocol=PLAINTEXT \ --create-namespace \ - --set image.registry=public.ecr.aws/i8k6a5e1 \ - --set image.repository=bitnami/kafka \ + --set image.registry=docker.io \ + --set image.repository=greptime/kafka \ --set image.tag=3.9.0-debian-12-r1 \ --version 31.0.0 \ -n ${{ inputs.namespace }} diff --git a/.github/actions/setup-postgres-cluster/action.yml b/.github/actions/setup-postgres-cluster/action.yml index 62aab57852..4f40bf51d3 100644 --- a/.github/actions/setup-postgres-cluster/action.yml +++ b/.github/actions/setup-postgres-cluster/action.yml @@ -21,8 +21,8 @@ runs: --install postgresql oci://registry-1.docker.io/bitnamicharts/postgresql \ --set replicaCount=${{ inputs.postgres-replicas }} \ --set global.security.allowInsecureImages=true \ - --set image.registry=public.ecr.aws/i8k6a5e1 \ - --set image.repository=bitnami/postgresql \ + --set image.registry=docker.io \ + --set image.repository=greptime/postgresql \ --set image.tag=17.5.0-debian-12-r3 \ --version 16.7.4 \ --set persistence.size=${{ inputs.storage-size }} \ diff --git a/.github/scripts/pull-test-deps-images.sh b/.github/scripts/pull-test-deps-images.sh index 968ac44079..3d0d712c51 100755 --- a/.github/scripts/pull-test-deps-images.sh +++ b/.github/scripts/pull-test-deps-images.sh @@ -7,11 +7,11 @@ set -e MAX_RETRIES=3 IMAGES=( - "public.ecr.aws/i8k6a5e1/bitnami/zookeeper:3.7" - "public.ecr.aws/i8k6a5e1/bitnami/kafka:3.9.0-debian-12-r1" - "public.ecr.aws/i8k6a5e1/bitnami/etcd:3.6.1-debian-12-r3" - "public.ecr.aws/i8k6a5e1/bitnami/minio:2024" - "public.ecr.aws/i8k6a5e1/bitnami/mysql:5.7" + "greptime/zookeeper:3.7" + "greptime/kafka:3.9.0-debian-12-r1" + "greptime/etcd:3.6.1-debian-12-r3" + "greptime/minio:2024" + "greptime/mysql:5.7" ) for image in "${IMAGES[@]}"; do diff --git a/tests-integration/fixtures/docker-compose.yml b/tests-integration/fixtures/docker-compose.yml index 366bf69482..b608c8ef61 100644 --- a/tests-integration/fixtures/docker-compose.yml +++ b/tests-integration/fixtures/docker-compose.yml @@ -1,14 +1,14 @@ services: zookeeper: - image: public.ecr.aws/i8k6a5e1/bitnami/zookeeper:3.7 + image: greptime/zookeeper:3.7 ports: - '2181:2181' environment: - ALLOW_ANONYMOUS_LOGIN=yes kafka: - image: public.ecr.aws/i8k6a5e1/bitnami/kafka:3.9.0-debian-12-r1 + image: greptime/kafka:3.9.0-debian-12-r1 container_name: kafka ports: - 9092:9092 @@ -32,7 +32,7 @@ services: condition: service_started etcd: - image: public.ecr.aws/i8k6a5e1/bitnami/etcd:3.6.1-debian-12-r3 + image: greptime/etcd:3.6.1-debian-12-r3 ports: - "2379:2379" - "2380:2380" @@ -44,7 +44,7 @@ services: ETCD_MAX_REQUEST_BYTES: 10485760 etcd-tls: - image: public.ecr.aws/i8k6a5e1/bitnami/etcd:3.6.1-debian-12-r3 + image: greptime/etcd:3.6.1-debian-12-r3 ports: - "2378:2378" - "2381:2381" @@ -71,7 +71,7 @@ services: - ./etcd-tls-certs:/certs:ro minio: - image: public.ecr.aws/i8k6a5e1/bitnami/minio:2024 + image: greptime/minio:2024 ports: - '9000:9000' - '9001:9001' @@ -108,7 +108,7 @@ services: mysql: - image: public.ecr.aws/i8k6a5e1/bitnami/mysql:5.7 + image: greptime/mysql:5.7 ports: - 3306:3306 volumes: diff --git a/tests/conf/kafka-cluster.yml b/tests/conf/kafka-cluster.yml index c205bafe3d..096a255442 100644 --- a/tests/conf/kafka-cluster.yml +++ b/tests/conf/kafka-cluster.yml @@ -2,7 +2,7 @@ version: '3.8' services: kafka: - image: public.ecr.aws/i8k6a5e1/bitnami/kafka:3.9.0-debian-12-r1 + image: greptime/kafka:3.9.0-debian-12-r1 container_name: kafka ports: - 9092:9092 diff --git a/tests/runner/src/util.rs b/tests/runner/src/util.rs index e4ba482de1..be8c9d4432 100644 --- a/tests/runner/src/util.rs +++ b/tests/runner/src/util.rs @@ -363,9 +363,9 @@ pub fn setup_mysql(mysql_port: u16, mysql_version: Option<&str>) { } let mysql_image = if let Some(mysql_version) = mysql_version { - format!("public.ecr.aws/i8k6a5e1/bitnami/mysql:{mysql_version}") + format!("greptime/mysql:{mysql_version}") } else { - "public.ecr.aws/i8k6a5e1/bitnami/mysql:5.7".to_string() + "greptime/mysql:5.7".to_string() }; let mysql_password = "admin"; let mysql_user = "greptimedb";