From 0806812a213a197044e71d03191056c2dd53384b Mon Sep 17 00:00:00 2001 From: "https://blog.iamtsm.cn" <1905333456@qq.com> Date: Sun, 13 Aug 2023 14:37:50 +0800 Subject: [PATCH] feat: update mysql image version fix: push shell error --- bin/auto-push-manifest-to-hub.sh | 13 ++++++++----- docker/mysql/Dockerfile | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) mode change 100644 => 100755 bin/auto-push-manifest-to-hub.sh diff --git a/bin/auto-push-manifest-to-hub.sh b/bin/auto-push-manifest-to-hub.sh old mode 100644 new mode 100755 index 583db12..84df33f --- a/bin/auto-push-manifest-to-hub.sh +++ b/bin/auto-push-manifest-to-hub.sh @@ -13,10 +13,13 @@ build_and_push_manifest() { local arch_arm64="arm64" local arch_x8664="x8664" - echo "###################################### push $image_prefix-$target_name:$tag" + echo "###################################### craete manifest $image_prefix-$target_name:$tag" docker manifest create $image_prefix-$target_name:$tag \ $image_prefix-$target_name-$arch_arm64:$tag \ $image_prefix-$target_name-$arch_x8664:$tag --amend + + echo "###################################### push manifest $image_prefix-$target_name:$tag" + docker manifest push $image_prefix-$target_name:$tag } latest_version=latest @@ -29,16 +32,16 @@ else for image_arg in "$@"; do case $image_arg in api) - build_and_push_image "api" $latest_version "api" + build_and_push_manifest "api" $latest_version "api" ;; socket) - build_and_push_image "socket" $latest_version "socket" + build_and_push_manifest "socket" $latest_version "socket" ;; mysql) - build_and_push_image "mysql" $latest_version "mysql" + build_and_push_manifest "mysql" $latest_version "mysql" ;; coturn) - build_and_push_image "coturn" $latest_version "coturn" + build_and_push_manifest "coturn" $latest_version "coturn" ;; *) echo "Invalid argument: $image_arg" diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile index e763a8e..1410e5c 100644 --- a/docker/mysql/Dockerfile +++ b/docker/mysql/Dockerfile @@ -1 +1 @@ -FROM mysql/mysql-server:5.7 \ No newline at end of file +FROM mysql/mysql-server:8.0 \ No newline at end of file