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

Merge pull request #7475 from zmstone/main-v4.4 

[4.4] update to builder images to 4.4-8
This commit is contained in:
Xinyu Liu 2022-03-31 18:49:25 +08:00 committed by GitHub
parent 815c96e37b 4438b9e59d
commit 494eb3413c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 21 additions and 18 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: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04 image: ghcr.io/emqx/emqx-builder/4.4-8:24.1.5-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@ on:
jobs: jobs:
prepare: prepare:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-8:24.1.5-3-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles}} 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: jobs:
test: test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/4.4-8:24.1.5-3-ubuntu20.04
strategy: strategy:
fail-fast: true fail-fast: true
env: env:

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

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

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

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

5
CHANGES-4.4.md
View File

@ -1,4 +1,4 @@
# EMQ X 4.4 Changes # EMQX 4.4 Changes
### Enhancements ### Enhancements
* Add rule events: client.connack, client.check_acl_complete * Add rule events: client.connack, client.check_acl_complete
@ -14,6 +14,9 @@
* Docker image is based on alpine-3.15.1 (OpenSSL-1.1.1n) * Docker image is based on alpine-3.15.1 (OpenSSL-1.1.1n)
* For docker image, /opt/emqx/etc has been removed from the VOLUME list, * For docker image, /opt/emqx/etc has been removed from the VOLUME list,
this made it easier for the users to rebuild image on top with changed configs. this made it easier for the users to rebuild image on top with changed configs.
* CentOS 7 Erlang runtime is rebuilt on OpenSSL-1.1.1n (previously on 1.0),
Prior to v4.4.1, EMQX may pick certain cipher suites proposed by the clients,
but then fail to handshake resulting in a `malformed_handshake_data` exception.
### Enhancements ### Enhancements

2
Makefile
View File

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

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-7:24.1.5-3-alpine3.15.1 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/4.4-8:24.1.5-3-alpine3.15.1
ARG RUN_FROM=alpine:3.15.1 ARG RUN_FROM=alpine:3.15.1
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder

4
scripts/buildx.sh
View File

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