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

Merge remote-tracking branch 'origin/main-v4.4' into main-v4.4

This commit is contained in:
Zaiming (Stone) Shi 2022-03-22 21:01:15 +01:00
parent 692e2c79a2 481f0bfa88
commit 8415abb05a
14 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/docker-compose-file/docker-compose.yaml
View File

@ -3,7 +3,7 @@ version: '3.9'
services:
erlang:
container_name: erlang
image: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
image: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
env_file:
- conf.env
environment:

2
.github/workflows/apps_version_check.yaml vendored
View File

@ -13,7 +13,7 @@ jobs:
os:
- ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:${{ matrix.erl_otp }}-${{ matrix.os }}
container: ghcr.io/emqx/emqx-builder/4.4-7:${{ matrix.erl_otp }}-${{ matrix.os }}
steps:
- uses: actions/checkout@v1

12
.github/workflows/build_packages.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
prepare:
runs-on: ubuntu-20.04
# prepare source with any OTP version, no need for a matrix
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
outputs:
profiles: ${{ steps.set_profile.outputs.profiles}}
@ -264,7 +264,7 @@ jobs:
--profile "${PROFILE}" \
--pkgtype "${PACKAGE}" \
--arch "${ARCH}" \
--builder "ghcr.io/emqx/emqx-builder/4.4-5:${OTP}-${SYSTEM}"
--builder "ghcr.io/emqx/emqx-builder/4.4-7:${OTP}-${SYSTEM}"
- uses: actions/upload-artifact@v1
if: startsWith(github.ref, 'refs/tags/')
with:
@ -339,8 +339,8 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-5:${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-7:${{ matrix.otp }}-alpine3.15.1
RUN_FROM=alpine:3.15.1
EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile
context: source
@ -354,8 +354,8 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-5:${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14
BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-7:${{ matrix.otp }}-alpine3.15.1
RUN_FROM=alpine:3.15.1
EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile.enterprise
context: source

2
.github/workflows/build_slim_packages.yaml vendored
View File

@ -23,7 +23,7 @@ jobs:
- ubuntu20.04
- rockylinux8
container: ghcr.io/emqx/emqx-builder/4.4-5:${{ matrix.erl_otp }}-${{ matrix.os }}
container: ghcr.io/emqx/emqx-builder/4.4-7:${{ matrix.erl_otp }}-${{ matrix.os }}
steps:
- uses: actions/checkout@v1

2
.github/workflows/check_deps_integrity.yaml vendored
View File

@ -5,7 +5,7 @@ on: [pull_request]
jobs:
check_deps_integrity:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
steps:
- uses: actions/checkout@v2

2
.github/workflows/release.yaml vendored
View File

@ -7,7 +7,7 @@ on:
jobs:
prepare:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
outputs:
profiles: ${{ steps.set_profile.outputs.profiles}}

2
.github/workflows/run_acl_migration_tests.yaml vendored
View File

@ -5,7 +5,7 @@ on: workflow_dispatch
jobs:
test:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
strategy:
fail-fast: true
env:

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

@ -224,7 +224,7 @@ jobs:
relup_test_plan:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
outputs:
profile: ${{ steps.profile-and-versions.outputs.profile }}
vsn: ${{ steps.profile-and-versions.outputs.vsn }}
@ -275,7 +275,7 @@ jobs:
otp:
- 24.1.5-3
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
defaults:
run:
shell: bash

2
.github/workflows/run_test_cases.yaml vendored
View File

@ -10,7 +10,7 @@ on:
jobs:
run_proper_test:
runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-ubuntu20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04
steps:
- uses: actions/checkout@v2

5
CHANGES-4.4.md
View File

@ -2,9 +2,14 @@
## v4.4.2
### Important changes
* Docker image is based on alpine-3.15.1 (OpenSSL-1.1.1n)
### Minor changes
* Windows package is built on Erlang/OTP 24
* Added debian11 build
## v4.4.1

4
Makefile
View File

@ -3,8 +3,8 @@ REBAR = $(CURDIR)/rebar3
BUILD = $(CURDIR)/build
SCRIPTS = $(CURDIR)/scripts
export EMQX_RELUP ?= true
export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-alpine3.14
export EMQX_DEFAULT_RUNNER = alpine:3.14
export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-alpine3.15.1
export EMQX_DEFAULT_RUNNER = alpine:3.15.1
export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
export DOCKERFILE := deploy/docker/Dockerfile

3
build
View File

@ -164,7 +164,8 @@ make_zip() {
log "Zip package sha256sum: $(cat "${target_zip}.sha256")"
}
## This function builds the default docker image based on alpine:3.14 (by default)
## This function builds the default docker image
## based images is by default $EMQX_DEFAULT_BUILDER (see Makefile)
make_docker() {
EMQX_BUILDER="${EMQX_BUILDER:-${EMQX_DEFAULT_BUILDER}}"
EMQX_RUNNER="${EMQX_RUNNER:-${EMQX_DEFAULT_RUNNER}}"

4
deploy/docker/Dockerfile
View File

@ -1,5 +1,5 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-alpine3.14
ARG RUN_FROM=alpine:3.14
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-alpine3.15.1
ARG RUN_FROM=alpine:3.15.1
FROM ${BUILD_FROM} AS builder
RUN apk add --no-cache \

4
scripts/buildx.sh
View File

@ -8,7 +8,7 @@
## i.e. will not work if docker command has to be executed with sudo
## example:
## ./scripts/buildx.sh --profile emqx --pkgtype zip --builder ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-debian10 --arch arm64
## ./scripts/buildx.sh --profile emqx --pkgtype zip --builder ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-debian10 --arch arm64
set -euo pipefail
@ -20,7 +20,7 @@ help() {
echo "--arch amd64|arm64: Target arch to build the EMQ X package for"
echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD"
echo "--builder <BUILDER>: Builder image to pull"
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-debian10"
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-debian10"
}
while [ "$#" -gt 0 ]; do