refactor: rename dockerhub repo and docker path (#1218)

AutoMQ · May 7, 2024 · df2a2fa · df2a2fa
1 parent 402aed0
commit df2a2fa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -6,6 +6,7 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
       - '[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
 
+
 jobs:
   docker-release:
     name: Docker Image Release
@@ -54,5 +55,5 @@ jobs:
         with:
           context: ./docker
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/kafka:${{ github.ref_name }}
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/automq:${{ github.ref_name }}
           platforms: linux/amd64,linux/arm64
diff --git a/automq_release.py b/automq_release.py
@@ -143,7 +143,7 @@ def do_release(tag, s3stream_tag):
     cmd(f"Checking out to release branch", f'git checkout --quiet -b {new_branch}')
 
     print("Updating docker compose")
-    regexReplace("docker/docker-compose.yaml", "image: automqinc/kafka:.*$", f"image: automqinc/kafka:{tag}")
+    regexReplace("docker/docker-compose.yaml", "image: automqinc/automq:.*$", f"image: automqinc/automq:{tag}")
     replace("gradle/dependencies.gradle", '    branch = "main"', f'    require "{s3stream_tag}"')
 
     cmd("Committing changes", ["git", "commit", "--all", "--gpg-sign", "--signoff", "--message", f"ci: bump version to {tag}"])

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -35,6 +35,7 @@ RUN chmod +x /opt/kafka/scripts/*.sh
 
 RUN mkdir -p /data/kafka
 
+RUN ln -s /opt/kafka /opt/automq
 WORKDIR /opt/kafka
 
 CMD tail -f /dev/null
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -53,7 +53,7 @@ services:
     container_name: "${CONTROLLER_DOCKER_NAME-controller}"
     hostname: "${CONTROLLER_DOCKER_NAME-controller}"
     stop_grace_period: 2m
-    image: automqinc/kafka:1.1.0-rc0
+    image: automqinc/automq:1.1.0-rc0
     environment:
       - KAFKA_S3_ACCESS_KEY=test
       - KAFKA_S3_SECRET_KEY=test
@@ -62,7 +62,7 @@ services:
       - bash
       - -c
       - |
-        /opt/kafka/scripts/start.sh up --process.roles controller --node.id 0 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
+        /opt/automq/scripts/start.sh up --process.roles controller --node.id 0 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
     networks:
       - afk_net
     depends_on:
@@ -73,7 +73,7 @@ services:
     container_name: "${BROKER1_DOCKER_NAME-broker1}"
     hostname: "${BROKER1_DOCKER_NAME-broker1}"
     stop_grace_period: 2m
-    image: automqinc/kafka:1.1.0-rc0
+    image: automqinc/automq:1.1.0-rc0
     ports:
       - "9094:9094"
     environment:
@@ -91,7 +91,7 @@ services:
       - bash
       - -c
       - |
-        /opt/kafka/scripts/start.sh up --process.roles broker --node.id 1 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
+        /opt/automq/scripts/start.sh up --process.roles broker --node.id 1 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
     networks:
       - afk_net
     depends_on:
@@ -103,7 +103,7 @@ services:
     container_name: "${BROKER2_DOCKER_NAME-broker2}"
     hostname: "${BROKER2_DOCKER_NAME-broker2}"
     stop_grace_period: 2m
-    image: automqinc/kafka:1.1.0-rc0
+    image: automqinc/automq:1.1.0-rc0
     ports:
       - "9095:9095"
     environment:
@@ -121,7 +121,7 @@ services:
       - bash
       - -c
       - |
-        /opt/kafka/scripts/start.sh up --process.roles broker --node.id 2 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
+        /opt/automq/scripts/start.sh up --process.roles broker --node.id 2 --controller.quorum.voters 0@controller:9093 --s3.bucket ko3 --s3.endpoint http://10.6.0.2:4566 --s3.region us-east-1
     networks:
       - afk_net
     depends_on:

diff --git a/docker/docker_manage.sh b/docker/docker_manage.sh
@@ -119,7 +119,7 @@ docker_push() {
     done
     prepare
     echo_and_do docker buildx build --platform linux/amd64,linux/arm64 \
-          -t "automqinc/kafka:${kafka_version}" \
+          -t "automqinc/automq:${kafka_version}" \
           . --push
 }
 
@@ -131,7 +131,7 @@ docker_build() {
         esac
     done
     prepare
-    echo_and_do docker build -t "automqinc/kafka:${kafka_version}" .
+    echo_and_do docker build -t "automqinc/automq:${kafka_version}" .
 #        --build-arg "general_mirror_url=mirrors.ustc.edu.cn" .
 
 }