|
|
@@ -385,6 +385,16 @@ docker_cleanup() {
|
|
|
[ -f ./.dockerignore.bak ] && mv ./.dockerignore.bak ./.dockerignore >/dev/null || true
|
|
|
}
|
|
|
|
|
|
+function is_ecr_and_enterprise() {
|
|
|
+ local registry="$1"
|
|
|
+ local profile="$2"
|
|
|
+ if [[ "$registry" == public.ecr.aws* ]] && [[ "$profile" == *enterprise* ]]; then
|
|
|
+ return 0
|
|
|
+ else
|
|
|
+ return 1
|
|
|
+ fi
|
|
|
+}
|
|
|
+
|
|
|
## Build the default docker image based on debian 11.
|
|
|
make_docker() {
|
|
|
local EMQX_BUILDER_VERSION="${EMQX_BUILDER_VERSION:-5.3-2}"
|
|
|
@@ -460,8 +470,10 @@ make_docker() {
|
|
|
)
|
|
|
:> ./.emqx_docker_image_tags
|
|
|
for r in "${DOCKER_REGISTRIES[@]}"; do
|
|
|
- DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_IMAGE_TAG}")
|
|
|
- echo "$r/${EMQX_IMAGE_TAG}" >> ./.emqx_docker_image_tags
|
|
|
+ if ! is_ecr_and_enterprise "$r" "$PROFILE"; then
|
|
|
+ DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_IMAGE_TAG}")
|
|
|
+ echo "$r/${EMQX_IMAGE_TAG}" >> ./.emqx_docker_image_tags
|
|
|
+ fi
|
|
|
done
|
|
|
if [ "${DOCKER_BUILD_NOCACHE:-false}" = true ]; then
|
|
|
DOCKER_BUILDX_ARGS+=(--no-cache)
|
|
|
@@ -471,12 +483,14 @@ make_docker() {
|
|
|
fi
|
|
|
if [ "${DOCKER_LATEST:-false}" = true ]; then
|
|
|
for r in "${DOCKER_REGISTRIES[@]}"; do
|
|
|
- DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:latest${SUFFIX}")
|
|
|
- echo "$r/${EMQX_BASE_DOCKER_TAG}:latest${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
- DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}${SUFFIX}")
|
|
|
- echo "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
- DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}.${VSN_PATCH}${SUFFIX}")
|
|
|
- echo "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}.${VSN_PATCH}${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
+ if ! is_ecr_and_enterprise "$r" "$PROFILE"; then
|
|
|
+ DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:latest${SUFFIX}")
|
|
|
+ echo "$r/${EMQX_BASE_DOCKER_TAG}:latest${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
+ DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}${SUFFIX}")
|
|
|
+ echo "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
+ DOCKER_BUILDX_ARGS+=(--tag "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}.${VSN_PATCH}${SUFFIX}")
|
|
|
+ echo "$r/${EMQX_BASE_DOCKER_TAG}:${VSN_MAJOR}.${VSN_MINOR}.${VSN_PATCH}${SUFFIX}" >> ./.emqx_docker_image_tags
|
|
|
+ fi
|
|
|
done
|
|
|
fi
|
|
|
if [ "${DOCKER_PLATFORMS:-default}" != 'default' ]; then
|