Merge pull request #7062 from thalesmg/bump-builder-image-50

chore(ci): update emqx-builder image

.ci/docker-compose-file/docker-compose.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   erlang23:
     container_name: erlang23
-    image: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-23.3.4.9-4-ubuntu20.04
+    image: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-23.3.4.9-4-ubuntu20.04
     env_file:
       - conf.env
     environment:
@@ -23,7 +23,7 @@ services:
 
   erlang24:
     container_name: erlang24
-    image: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04
+    image: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04
     env_file:
       - conf.env
     environment:

.github/workflows/build_packages.yaml

@@ -22,7 +22,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/5.0-5:1.13.2-24.1.5-4-ubuntu20.04"
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04"
 
     outputs:
       DEP_ROCKSDB_REF: ${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
@@ -108,7 +108,7 @@ jobs:
           - emqx
           - emqx-enterprise
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         os:
           - macos-11
           - macos-10.15
@@ -196,7 +196,7 @@ jobs:
     needs: prepare
     runs-on: ${{ matrix.build_machine }}
     container:
-      image: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+      image: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
     strategy:
       fail-fast: false
@@ -206,9 +206,9 @@ jobs:
           - emqx
           - emqx-enterprise
         otp:
-          - 24.1.5-4 # we test with OTP 23, but only build package on OTP 24 versions
+          - 24.2.1-1 # we test with OTP 23, but only build package on OTP 24 versions
         elixir:
-          - 1.13.2
+          - 1.13.3
         # used to split elixir packages into a separate job, since the
         # entire job may take a lot of time, especially on arm64
         # emulation.
@@ -255,15 +255,15 @@ jobs:
           profile: emqx-enterprise
         include:
           - profile: emqx
-            otp: 24.1.5-4
-            elixir: 1.13.2
+            otp: 24.2.1-1
+            elixir: 1.13.3
             build_elixir: with_elixir
             arch: amd64
             os: ubuntu20.04
             build_machine: ubuntu-20.04
           - profile: emqx
-            otp: 24.1.5-4
-            elixir: 1.13.2
+            otp: 24.2.1-1
+            elixir: 1.13.3
             build_elixir: with_elixir
             arch: amd64
             os: centos7
@@ -328,7 +328,7 @@ jobs:
             --otp "${OTP}" \
             --elixir "${ELIXIR}" "$WithElixir" \
             --system "${SYSTEM}" \
-            --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
+            --builder "ghcr.io/emqx/emqx-builder/5.0-7:${ELIXIR}-${OTP}-${SYSTEM}"
         done
     - uses: actions/upload-artifact@v1
       if: startsWith(github.ref, 'refs/tags/')
@@ -352,9 +352,9 @@ jobs:
         # NOTE: for docker, only support latest otp and elixir
         # versions, not a matrix
         otp:
-          - 24.1.5-4 # update to latest
+          - 24.2.1-1 # update to latest
         elixir:
-          - 1.13.2 # update to latest
+          - 1.13.3 # update to latest
         arch:
           - amd64
           - arm64
@@ -371,8 +371,8 @@ jobs:
         include:
           - os: alpine3.14
             profile: emqx
-            otp: 24.1.5-4
-            elixir: 1.13.2
+            otp: 24.2.1-1
+            elixir: 1.13.3
             arch: amd64
             build_elixir: with_elixir
             build_machine: ubuntu-20.04
@@ -454,7 +454,7 @@ jobs:
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
         build-args: |
-          BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+          BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
           RUN_FROM=${{ steps.pre-meta.outputs.img }}
           EMQX_NAME=${{ steps.pre-meta.outputs.emqx_name }}
         file: source/deploy/docker/Dockerfile
@@ -496,10 +496,10 @@ jobs:
           - emqx-enterprise
         # NOTE: for docker, only support latest otp version, not a matrix
         otp:
-          - 24.1.5-4 # update to latest
+          - 24.2.1-1 # update to latest
           #
         elixir:
-          - 1.13.2 # update to latest
+          - 1.13.3 # update to latest
         arch:
           - amd64
           - arm64
@@ -516,8 +516,8 @@ jobs:
         include:
           - os: alpine3.14
             profile: emqx
-            otp: 24.1.5-4
-            elixir: 1.13.2
+            otp: 24.2.1-1
+            elixir: 1.13.3
             arch: amd64
             build_elixir: with_elixir
             build_machine: ubuntu-20.04
@@ -617,7 +617,7 @@ jobs:
           - emqx
           - emqx-enterprise
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         include:
           - profile: emqx
             otp: windows # otp version on windows is rather fixed

.github/workflows/build_slim_packages.yaml

@@ -36,14 +36,14 @@ jobs:
         - emqx
         - emqx-enterprise
         otp:
-        - 24.1.5-4
+        - 24.2.1-1
         elixir:
-        - 1.13.2
+        - 1.13.3
         os:
         - ubuntu20.04
         - centos7
 
-    container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
     steps:
     - uses: actions/checkout@v1
@@ -141,7 +141,7 @@ jobs:
         - emqx
         - emqx-enterprise
         otp:
-        - 24.1.5-4
+        - 24.2.1-1
         macos:
         - macos-11
         - macos-10.15

.github/workflows/check_deps_integrity.yaml

@@ -5,7 +5,7 @@ on: [pull_request, push]
 jobs:
   check_deps_integrity:
     runs-on: ubuntu-20.04
-    container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04
+    container: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/code_style_check.yaml

@@ -7,13 +7,13 @@ jobs:
     strategy:
       matrix:
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         elixir:
-          - 1.13.2
+          - 1.13.3
         os:
           - ubuntu20.04
     runs-on: ubuntu-20.04
-    container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
     steps:
       - uses: actions/checkout@v2
         with:

.github/workflows/elixir_apps_check.yaml

@@ -7,7 +7,8 @@ on: [pull_request, push]
 jobs:
   elixir_apps_check:
     runs-on: ubuntu-20.04
-    container: hexpm/elixir:1.13.2-erlang-24.2-alpine-3.15.0
+    # just use the latest builder
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04"
 
     strategy:
       fail-fast: false
@@ -30,8 +31,6 @@ jobs:
             edition_type: enterprise
 
     steps:
-      - name: install
-        run: apk add make bash curl git
       - name: Checkout
         uses: actions/checkout@v2.4.0
         with:

.github/workflows/elixir_deps_check.yaml

@@ -7,7 +7,7 @@ on: [pull_request, push]
 jobs:
   elixir_deps_check:
     runs-on: ubuntu-20.04
-    container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04
+    container: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04
 
     steps:
       - name: Checkout

.github/workflows/elixir_release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04
+    container: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-ubuntu20.04
 
     steps:
       - name: Checkout

.github/workflows/run_api_tests.yaml

@@ -18,15 +18,15 @@ jobs:
     strategy:
       matrix:
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         elixir:
-          - 1.13.2
+          - 1.13.3
         os:
           - ubuntu20.04
         arch:
           - amd64
     runs-on: ubuntu-latest
-    container: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+    container: ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/run_emqx_app_tests.yaml

@@ -15,19 +15,19 @@ jobs:
       matrix:
         otp:
           - 23.3.4.9-4
-          - 24.1.5-4
+          - 24.2.1-1
         # no need to use more than 1 version of Elixir, since tests
         # run using only Erlang code.  This is needed just to specify
         # the base image.
         elixir:
-          - 1.13.2
+          - 1.13.3
         os:
           - ubuntu20.04
         arch:
           - amd64
 
     runs-on: ubuntu-20.04
-    container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/run_fvt_tests.yaml

@@ -16,7 +16,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/5.0-5:1.13.2-24.1.5-4-alpine3.14
+    container: ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-alpine3.14
 
     steps:
       - uses: actions/checkout@v2
@@ -50,9 +50,9 @@ jobs:
         os:
           - alpine3.14
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         elixir:
-          - 1.13.2
+          - 1.13.3
         arch:
           - amd64
         exclude:
@@ -91,7 +91,7 @@ jobs:
     - name: make docker image
       working-directory: source
       env:
-        EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+        EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
       run: |
         make ${{ matrix.profile }}-docker
     - name: run emqx
@@ -134,9 +134,9 @@ jobs:
         os:
           - alpine3.14
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         elixir:
-          - 1.13.2
+          - 1.13.3
         arch:
           - amd64
       # - emqx-enterprise # TODO test enterprise
@@ -170,7 +170,7 @@ jobs:
     - name: make docker image
       working-directory: source
       env:
-        EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+        EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
       run: |
         make ${{ matrix.profile }}-docker
         echo "TARGET=emqx/${{ matrix.profile }}" >> $GITHUB_ENV

.github/workflows/run_relup_tests.yaml

@@ -21,19 +21,19 @@ jobs:
           - emqx
           - emqx-enterprise
         otp:
-          - 24.1.5-4
+          - 24.2.1-1
         # no need to use more than 1 version of Elixir, since tests
         # run using only Erlang code.  This is needed just to specify
         # the base image.
         elixir:
-          - 1.13.2
+          - 1.13.3
         os:
           - ubuntu20.04
         arch:
           - amd64
 
     runs-on: ubuntu-20.04
-    container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+    container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
     defaults:
       run:

.github/workflows/run_test_cases.yaml

@@ -18,16 +18,16 @@ jobs:
         strategy:
           matrix:
             otp:
-              - 24.1.5-4
+              - 24.2.1-1
             elixir:
-              - 1.13.2
+              - 1.13.3
             os:
               - ubuntu20.04
             arch:
               - amd64
 
         runs-on: ubuntu-20.04
-        container: "ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
+        container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
 
         steps:
         - uses: actions/checkout@v2

.tool-versions

@@ -1,2 +1,2 @@
-erlang 24.1.5-4
-elixir 1.13.2-otp-24
+erlang 24.2.1-1
+elixir 1.13.3-otp-24

Makefile

@@ -4,7 +4,7 @@ REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
 export EMQX_RELUP ?= true
-export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-alpine3.14
+export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-alpine3.14
 export EMQX_DEFAULT_RUNNER = alpine:3.14
 export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
 export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh)

deploy/docker/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-alpine3.14
+ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-alpine3.14
 ARG RUN_FROM=alpine:3.14
 FROM ${BUILD_FROM} AS builder