This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new fe66637d5 [INLONG-7323][Improve][Docker] Add push manifest for
tubemq-all and tubemq-manager (#7324)
fe66637d5 is described below
commit fe66637d54522e605f64669aeadcc9c6d962a6d9
Author: Lucas <[email protected]>
AuthorDate: Mon Feb 6 18:36:59 2023 +0800
[INLONG-7323][Improve][Docker] Add push manifest for tubemq-all and
tubemq-manager (#7324)
---
docker/build-docker-images.sh | 6 +++---
docker/publish-by-arch.sh | 28 ++++++++++++++--------------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/docker/build-docker-images.sh b/docker/build-docker-images.sh
index f2909d084..d965e54d3 100644
--- a/docker/build-docker-images.sh
+++ b/docker/build-docker-images.sh
@@ -135,10 +135,10 @@ echo "=== Build docker tag:${tag} ==="
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/manager:${tag}
inlong-manager/manager-docker/ --build-arg VERSION=${version}
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/dataproxy:${tag}
inlong-dataproxy/dataproxy-docker/ --build-arg
DATAPROXY_TARBALL=${DATAPROXY_TARBALL}
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/audit:${tag}
inlong-audit/audit-docker/ --build-arg
AUDIT_TARBALL=${AUDIT_TARBALL}
-docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t
inlong/tubemq-manager:${tag} inlong-tubemq/tubemq-docker/tubemq-manager/
--build-arg TUBEMQ_MANAGER_TARBALL=${TUBEMQ_MANAGER_TARBALL}
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/dashboard:${tag}
inlong-dashboard/ --build-arg
DASHBOARD_FILE=${DASHBOARD_FILE}
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/agent:${tag}
inlong-agent/agent-docker/ --build-arg
AGENT_TARBALL=${AGENT_TARBALL}
-docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/tubemq-all:${tag}
inlong-tubemq/tubemq-docker/tubemq-all/ --build-arg
TUBEMQ_TARBALL=${TUBEMQ_TARBALL}
+docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t inlong/tubemq-all:${tag}
inlong-tubemq/tubemq-docker/tubemq-all/ --build-arg
TUBEMQ_TARBALL=${TUBEMQ_TARBALL}
+docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t
inlong/tubemq-manager:${tag} inlong-tubemq/tubemq-docker/tubemq-manager/
--build-arg TUBEMQ_MANAGER_TARBALL=${TUBEMQ_MANAGER_TARBALL}
if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t
inlong/tubemq-cpp:${tag} inlong-tubemq/tubemq-docker/tubemq-cpp/
docker ${USE_BUILDX} build ${USE_PLATFORM} ${TYPE} -t
inlong/tubemq-build:${tag} inlong-tubemq/tubemq-docker/tubemq-build/
@@ -156,7 +156,7 @@ docker tag inlong/audit:${tag}
inlong/audit:latest${POSTFIX}
docker tag inlong/tubemq-manager:${tag} inlong/tubemq-manager:latest${POSTFIX}
docker tag inlong/dashboard:${tag} inlong/dashboard:latest${POSTFIX}
docker tag inlong/agent:${tag} inlong/agent:latest${POSTFIX}
-docker tag inlong/tubemq-all:${tag} inlong/tubemq-all:latest${POSTFIX}
+docker tag inlong/tubemq-all:${tag} inlong/tubemq-all:latest${POSTFIX}
if [ "$BUILD_ARCH" = "$ARCH_X86" ]; then
docker tag inlong/tubemq-cpp:${tag} inlong/tubemq-cpp:latest${POSTFIX}
docker tag inlong/tubemq-build:${tag} inlong/tubemq-build:latest${POSTFIX}
diff --git a/docker/publish-by-arch.sh b/docker/publish-by-arch.sh
index 2d7ac7d60..8cfd5d30f 100644
--- a/docker/publish-by-arch.sh
+++ b/docker/publish-by-arch.sh
@@ -206,14 +206,14 @@ pushImage() {
pushManifest() {
echo "Start pushing manifest ..."
- docker manifest create --insecure --amend inlong/manager:latest
inlong/manager:latest-aarch64 inlong/manager:latest-x86
- docker manifest create --insecure --amend inlong/agent:latest
inlong/agent:latest-aarch64 inlong/agent:latest-x86
- docker manifest create --insecure --amend inlong/dataproxy:latest
inlong/dataproxy:latest-aarch64 inlong/dataproxy:latest-x86
- docker manifest create --insecure --amend inlong/dashboard:latest
inlong/dashboard:latest-aarch64 inlong/dashboard:latest-x86
- docker manifest create --insecure --amend inlong/audit:latest
inlong/audit:latest-aarch64 inlong/audit:latest-x86
+ docker manifest create --insecure --amend inlong/manager:latest
inlong/manager:latest-aarch64 inlong/manager:latest-x86
+ docker manifest create --insecure --amend inlong/agent:latest
inlong/agent:latest-aarch64 inlong/agent:latest-x86
+ docker manifest create --insecure --amend inlong/dataproxy:latest
inlong/dataproxy:latest-aarch64 inlong/dataproxy:latest-x86
+ docker manifest create --insecure --amend inlong/dashboard:latest
inlong/dashboard:latest-aarch64 inlong/dashboard:latest-x86
+ docker manifest create --insecure --amend inlong/audit:latest
inlong/audit:latest-aarch64 inlong/audit:latest-x86
+ docker manifest create --insecure --amend inlong/tubemq-all:latest
inlong/tubemq-all:latest-aarch64 inlong/tubemq-all:latest-x86
+ docker manifest create --insecure --amend inlong/tubemq-manager:latest
inlong/tubemq-manager:latest-aarch64 inlong/tubemq-manager:latest-x86
docker manifest create --insecure --amend inlong/tubemq-cpp:latest
inlong/tubemq-cpp:latest-x86
- docker manifest create --insecure --amend inlong/tubemq-manager:latest
inlong/tubemq-manager:latest-x86
- docker manifest create --insecure --amend inlong/tubemq-all:latest
inlong/tubemq-all:latest-x86
docker manifest create --insecure --amend inlong/tubemq-build:latest
inlong/tubemq-build:latest-x86
docker manifest push inlong/manager:latest
@@ -226,13 +226,13 @@ pushManifest() {
docker manifest push inlong/tubemq-cpp:latest
docker manifest push inlong/audit:latest
- docker manifest create --insecure --amend inlong/manager:${MVN_VERSION}
inlong/manager:${MVN_VERSION}-aarch64 inlong/manager:${MVN_VERSION}-x86
- docker manifest create --insecure --amend inlong/agent:${MVN_VERSION}
inlong/agent:${MVN_VERSION}-aarch64 inlong/agent:${MVN_VERSION}-x86
- docker manifest create --insecure --amend inlong/dataproxy:${MVN_VERSION}
inlong/dataproxy:${MVN_VERSION}-aarch64 inlong/dataproxy:${MVN_VERSION}-x86
- docker manifest create --insecure --amend inlong/dashboard:${MVN_VERSION}
inlong/dashboard:${MVN_VERSION}-aarch64 inlong/dashboard:${MVN_VERSION}-x86
- docker manifest create --insecure --amend inlong/audit:${MVN_VERSION}
inlong/audit:${MVN_VERSION}-aarch64 inlong/audit:${MVN_VERSION}-x86
- docker manifest create --insecure --amend
inlong/tubemq-manager:${MVN_VERSION} inlong/tubemq-manager:${MVN_VERSION}-x86
- docker manifest create --insecure --amend inlong/tubemq-all:${MVN_VERSION}
inlong/tubemq-all:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/manager:${MVN_VERSION}
inlong/manager:${MVN_VERSION}-aarch64 inlong/manager:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/agent:${MVN_VERSION}
inlong/agent:${MVN_VERSION}-aarch64 inlong/agent:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/dataproxy:${MVN_VERSION}
inlong/dataproxy:${MVN_VERSION}-aarch64
inlong/dataproxy:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/dashboard:${MVN_VERSION}
inlong/dashboard:${MVN_VERSION}-aarch64
inlong/dashboard:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/audit:${MVN_VERSION}
inlong/audit:${MVN_VERSION}-aarch64 inlong/audit:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend
inlong/tubemq-manager:${MVN_VERSION}
inlong/tubemq-manager:${MVN_VERSION}-aarch64
inlong/tubemq-manager:${MVN_VERSION}-x86
+ docker manifest create --insecure --amend inlong/tubemq-all:${MVN_VERSION}
inlong/tubemq-all:${MVN_VERSION}-aarch64
inlong/tubemq-all:${MVN_VERSION}-x86
docker manifest create --insecure --amend inlong/tubemq-build:${MVN_VERSION}
inlong/tubemq-build:${MVN_VERSION}-x86
docker manifest create --insecure --amend inlong/tubemq-cpp:${MVN_VERSION}
inlong/tubemq-cpp:${MVN_VERSION}-x86
