From 143673b703f8b4fddfd3afea2565a29e8ef851c9 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 10 Oct 2023 14:35:46 +0200 Subject: [PATCH 1/3] chore: bump release version to 5.3.1-alpha.1 --- apps/emqx/include/emqx_release.hrl | 4 ++-- deploy/charts/emqx-enterprise/Chart.yaml | 4 ++-- deploy/charts/emqx/Chart.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index e77ff8656..904c432b4 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,10 +32,10 @@ %% `apps/emqx/src/bpapi/README.md' %% Opensource edition --define(EMQX_RELEASE_CE, "5.3.0"). +-define(EMQX_RELEASE_CE, "5.3.1.alpha.1"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.3.0"). +-define(EMQX_RELEASE_EE, "5.3.1.alpha.1"). %% The HTTP API version -define(EMQX_API_VERSION, "5.0"). diff --git a/deploy/charts/emqx-enterprise/Chart.yaml b/deploy/charts/emqx-enterprise/Chart.yaml index cd004f0a5..c881481d5 100644 --- a/deploy/charts/emqx-enterprise/Chart.yaml +++ b/deploy/charts/emqx-enterprise/Chart.yaml @@ -14,8 +14,8 @@ type: application # 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. -version: 5.3.0 +version: 5.3.1-alpha.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 5.3.0 +appVersion: 5.3.-alpha.1 diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml index f1c26cc8d..54d36eee3 100644 --- a/deploy/charts/emqx/Chart.yaml +++ b/deploy/charts/emqx/Chart.yaml @@ -14,8 +14,8 @@ type: application # 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. -version: 5.3.0 +version: 5.3.1-alpha.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 5.3.0 +appVersion: 5.3.1-alpha.1 From bfb2218392bcd18a6bdcb15dd05b6043180dcb1c Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Tue, 10 Oct 2023 14:50:49 +0200 Subject: [PATCH 2/3] chore: fix release version --- apps/emqx/include/emqx_release.hrl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 904c432b4..4a9340d11 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,10 +32,10 @@ %% `apps/emqx/src/bpapi/README.md' %% Opensource edition --define(EMQX_RELEASE_CE, "5.3.1.alpha.1"). +-define(EMQX_RELEASE_CE, "5.3.1-alpha.1"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.3.1.alpha.1"). +-define(EMQX_RELEASE_EE, "5.3.1-alpha.1"). %% The HTTP API version -define(EMQX_API_VERSION, "5.0"). From f5b0f965219a16132e608088f8e279a4c27020d1 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Tue, 10 Oct 2023 14:51:07 +0200 Subject: [PATCH 3/3] chore(docker): use public.ecr.aws registry for base image --- Makefile | 2 +- deploy/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42ae88e95..3d11491f9 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ BUILD = $(CURDIR)/build SCRIPTS = $(CURDIR)/scripts export EMQX_RELUP ?= true export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.1-4:1.14.5-25.3.2-2-debian11 -export EMQX_DEFAULT_RUNNER = debian:11-slim +export EMQX_DEFAULT_RUNNER = public.ecr.aws/debian/debian:11-slim export EMQX_REL_FORM ?= tgz export QUICER_DOWNLOAD_FROM_RELEASE = 1 ifeq ($(OS),Windows_NT) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 76ded75eb..ec227cb61 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.1-4:1.14.5-25.3.2-2-debian11 -ARG RUN_FROM=debian:11-slim +ARG RUN_FROM=public.ecr.aws/debian/debian:11-slim FROM ${BUILD_FROM} AS builder COPY . /emqx