yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12644 from thalesmg/prepare-560-alpha1-r56-20240304 

fix docker repository enumeration and prepare `e5.6.0-alpha.2`
This commit is contained in:
Thales Macedo Garitezi 2024-03-04 17:20:52 -03:00 committed by GitHub
parent 168a4a7e1e 61328eb91a
commit 8fbb883ba8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_and_push_docker_images.yaml vendored
View File

@ -175,7 +175,10 @@ jobs:
EMQX_SOURCE_TYPE: tgz EMQX_SOURCE_TYPE: tgz
run: | run: |
./build ${PROFILE} docker ./build ${PROFILE} docker
echo "Built tags:"
echo "==========="
cat .emqx_docker_image_tags cat .emqx_docker_image_tags
echo "==========="
echo "_EMQX_DOCKER_IMAGE_TAG=$(head -n 1 .emqx_docker_image_tags)" >> $GITHUB_ENV echo "_EMQX_DOCKER_IMAGE_TAG=$(head -n 1 .emqx_docker_image_tags)" >> $GITHUB_ENV
- name: smoke test - name: smoke test
@ -204,5 +207,6 @@ jobs:
if: inputs.publish || github.repository_owner != 'emqx' if: inputs.publish || github.repository_owner != 'emqx'
run: | run: |
for tag in $(cat .emqx_docker_image_tags); do for tag in $(cat .emqx_docker_image_tags); do
echo "Pushing tag $tag"
docker push $tag docker push $tag
done done

4
apps/emqx/include/emqx_release.hrl
View File

@ -32,7 +32,7 @@
%% `apps/emqx/src/bpapi/README.md' %% `apps/emqx/src/bpapi/README.md'
%% Opensource edition %% Opensource edition
-define(EMQX_RELEASE_CE, "5.6.0-alpha.1"). -define(EMQX_RELEASE_CE, "5.6.0-alpha.2").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.6.0-alpha.1"). -define(EMQX_RELEASE_EE, "5.6.0-alpha.2").

30
build
View File

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

4
deploy/charts/emqx-enterprise/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: 5.6.0-alpha.1 version: 5.6.0-alpha.2
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.6.0-alpha.1 appVersion: 5.6.0-alpha.2

4
deploy/charts/emqx/Chart.yaml
View File

@ -14,8 +14,8 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: 5.6.0-alpha.1 version: 5.6.0-alpha.2
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 5.6.0-alpha.1 appVersion: 5.6.0-alpha.2