This is an automated email from the ASF dual-hosted git repository. zirui pushed a commit to branch release-1.3.0 in repository https://gitbox.apache.org/repos/asf/inlong.git
commit 5c6f52ffdb050436d8a9eda2584f145e4041bbd9 Author: Lucas <[email protected]> AuthorDate: Wed Aug 24 10:48:51 2022 +0800 [INLONG-5652][Docker] Fix push aarch64 images script (#5653) --- .github/workflows/ci_docker.yml | 2 ++ docker/publish-by-arch.sh | 54 ++++++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_docker.yml b/.github/workflows/ci_docker.yml index 07b865a02..6e99958bd 100644 --- a/.github/workflows/ci_docker.yml +++ b/.github/workflows/ci_docker.yml @@ -103,6 +103,7 @@ jobs: env: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_ORG: inlong # Publish aarch64 Docker images when the changes are being pushed to a release branch like 'release-1.0.0'. - name: Push aarch64 Docker images to Docker Hub @@ -114,6 +115,7 @@ jobs: env: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + DOCKER_ORG: inlong # Push manifest after publishing aarch64 Docker images. - name: Push manifest to Docker Hub diff --git a/docker/publish-by-arch.sh b/docker/publish-by-arch.sh index 12b373b72..f8e5e7c1c 100644 --- a/docker/publish-by-arch.sh +++ b/docker/publish-by-arch.sh @@ -73,13 +73,12 @@ initTagImageForx86() { } tagImage() { + echo "Start tagging images" if [[ -z ${DOCKER_REGISTRY} ]]; then docker_registry_org=${DOCKER_ORG} else docker_registry_org=${DOCKER_REGISTRY}/${DOCKER_ORG} fi - echo "Start tagging images" - if [ "$BUILD_ARCH" = "$ARCH_AARCH64" ]; then SRC_POSTFIX="-aarch64" DES_POSTFIX="-aarch64" @@ -93,21 +92,25 @@ tagImage() { docker tag inlong/agent:latest${SRC_POSTFIX} ${docker_registry_org}/agent:latest${DES_POSTFIX} docker tag inlong/dataproxy:latest${SRC_POSTFIX} ${docker_registry_org}/dataproxy:latest${DES_POSTFIX} docker tag inlong/tubemq-manager:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-manager:latest${DES_POSTFIX} - docker tag inlong/tubemq-all:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-all:latest${DES_POSTFIX} - docker tag inlong/tubemq-build:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-build:latest${DES_POSTFIX} docker tag inlong/dashboard:latest${SRC_POSTFIX} ${docker_registry_org}/dashboard:latest${DES_POSTFIX} - docker tag inlong/tubemq-cpp:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-cpp:latest${DES_POSTFIX} docker tag inlong/audit:latest${SRC_POSTFIX} ${docker_registry_org}/audit:latest${DES_POSTFIX} + if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then + docker tag inlong/tubemq-cpp:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-cpp:latest${DES_POSTFIX} + docker tag inlong/tubemq-all:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-all:latest${DES_POSTFIX} + docker tag inlong/tubemq-build:latest${SRC_POSTFIX} ${docker_registry_org}/tubemq-build:latest${DES_POSTFIX} + fi docker tag inlong/manager:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/manager:${MVN_VERSION}${DES_POSTFIX} docker tag inlong/agent:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/agent:${MVN_VERSION}${DES_POSTFIX} docker tag inlong/dataproxy:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/dataproxy:${MVN_VERSION}${DES_POSTFIX} docker tag inlong/tubemq-manager:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-manager:${MVN_VERSION}${DES_POSTFIX} - docker tag inlong/tubemq-all:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-all:${MVN_VERSION}${DES_POSTFIX} - docker tag inlong/tubemq-build:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-build:${MVN_VERSION}${DES_POSTFIX} docker tag inlong/dashboard:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/dashboard:${MVN_VERSION}${DES_POSTFIX} - docker tag inlong/tubemq-cpp:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-cpp:${MVN_VERSION}${DES_POSTFIX} docker tag inlong/audit:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/audit:${MVN_VERSION}${DES_POSTFIX} + if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then + docker tag inlong/tubemq-cpp:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-cpp:${MVN_VERSION}${DES_POSTFIX} + docker tag inlong/tubemq-all:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-all:${MVN_VERSION}${DES_POSTFIX} + docker tag inlong/tubemq-build:${MVN_VERSION}${SRC_POSTFIX} ${docker_registry_org}/tubemq-build:${MVN_VERSION}${DES_POSTFIX} + fi echo "End tagging images" } @@ -130,18 +133,11 @@ publishImages() { exit 1 fi - if [[ -z ${DOCKER_REGISTRY} ]]; then - docker_registry_org=${DOCKER_ORG} - else - docker_registry_org=${DOCKER_REGISTRY}/${DOCKER_ORG} - echo "Starting to push images to ${docker_registry_org}..." - fi - set -x set -e - pushImage ${docker_registry_org} + pushImage } pushDefaultImage() { @@ -167,8 +163,12 @@ pushDefaultImage() { } pushImage() { - echo "Start pushing images" - docker_registry_org=$1 + if [[ -z ${DOCKER_REGISTRY} ]]; then + docker_registry_org=${DOCKER_ORG} + else + docker_registry_org=${DOCKER_REGISTRY}/${DOCKER_ORG} + fi + echo "Start pushing images to ${docker_registry_org}" SRC_POSTFIX="" if [ "$BUILD_ARCH" = "$ARCH_AARCH64" ]; then @@ -182,23 +182,27 @@ pushImage() { docker push inlong/agent:latest${SRC_POSTFIX} docker push inlong/dataproxy:latest${SRC_POSTFIX} docker push inlong/tubemq-manager:latest${SRC_POSTFIX} - docker push inlong/tubemq-all:latest${SRC_POSTFIX} - docker push inlong/tubemq-build:latest${SRC_POSTFIX} docker push inlong/dashboard:latest${SRC_POSTFIX} - docker push inlong/tubemq-cpp:latest${SRC_POSTFIX} docker push inlong/audit:latest${SRC_POSTFIX} + if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then + docker push inlong/tubemq-build:latest${SRC_POSTFIX} + docker push inlong/tubemq-all:latest${SRC_POSTFIX} + docker push inlong/tubemq-cpp:latest${SRC_POSTFIX} + fi docker push inlong/manager:${MVN_VERSION}${SRC_POSTFIX} docker push inlong/agent:${MVN_VERSION}${SRC_POSTFIX} docker push inlong/dataproxy:${MVN_VERSION}${SRC_POSTFIX} docker push inlong/tubemq-manager:${MVN_VERSION}${SRC_POSTFIX} - docker push inlong/tubemq-all:${MVN_VERSION}${SRC_POSTFIX} - docker push inlong/tubemq-build:${MVN_VERSION}${SRC_POSTFIX} docker push inlong/dashboard:${MVN_VERSION}${SRC_POSTFIX} - docker push inlong/tubemq-cpp:${MVN_VERSION}${SRC_POSTFIX} docker push inlong/audit:${MVN_VERSION}${SRC_POSTFIX} + if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then + docker push inlong/tubemq-all:${MVN_VERSION}${SRC_POSTFIX} + docker push inlong/tubemq-build:${MVN_VERSION}${SRC_POSTFIX} + docker push inlong/tubemq-cpp:${MVN_VERSION}${SRC_POSTFIX} + fi - echo "Finished pushing images to ${docker_registry_org}" + echo "Finished pushing images to inlong" } pushManifest() {
