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

chore(elixir_otp): bump emqx-builder images

This commit is contained in:
Thales Macedo Garitezi 2022-01-24 14:34:55 -03:00
parent e157064e24
commit 506dad169a
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
16 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

36
.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/5.0-4:1.13.1-24.1.5-3-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04"
outputs: outputs:
ce_old_vsns: ${{ steps.find_old_versons.outputs.ce_old_vsns }} ce_old_vsns: ${{ steps.find_old_versons.outputs.ce_old_vsns }}
@ -130,7 +130,7 @@ jobs:
- emqx - emqx
- emqx-enterprise - emqx-enterprise
otp: otp:
- 24.1.5-3 - 24.1.5-4
macos: macos:
- macos-11 - macos-11
- macos-10.15 - macos-10.15
@ -236,9 +236,9 @@ jobs:
- emqx - emqx
- emqx-enterprise - emqx-enterprise
otp: otp:
- 24.1.5-3 # we test with OTP 23, but only build package on OTP 24 versions - 24.1.5-4 # we test with OTP 23, but only build package on OTP 24 versions
elixir: elixir:
- 1.13.1 - 1.13.2
# used to split elixir packages into a separate job, since the # used to split elixir packages into a separate job, since the
# entire job may take a lot of time, especially on arm64 # entire job may take a lot of time, especially on arm64
# emulation. # emulation.
@ -277,14 +277,14 @@ jobs:
profile: emqx-enterprise profile: emqx-enterprise
include: include:
- profile: emqx - profile: emqx
otp: 24.1.5-3 otp: 24.1.5-4
elixir: 1.13.1 elixir: 1.13.2
arch: amd64 arch: amd64
build_elixir: with_elixir build_elixir: with_elixir
os: ubuntu20.04 os: ubuntu20.04
- profile: emqx - profile: emqx
otp: 24.1.5-3 otp: 24.1.5-4
elixir: 1.13.1 elixir: 1.13.2
arch: amd64 arch: amd64
build_elixir: with_elixir build_elixir: with_elixir
os: centos8 os: centos8
@ -376,7 +376,7 @@ jobs:
--otp "${OTP}" \ --otp "${OTP}" \
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
## the pkg build is incremental on the tgz build ## the pkg build is incremental on the tgz build
./scripts/buildx.sh \ ./scripts/buildx.sh \
--profile "${PROFILE}" \ --profile "${PROFILE}" \
@ -385,7 +385,7 @@ jobs:
--otp "${OTP}" \ --otp "${OTP}" \
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
- name: build emqx packages (Elixir) - name: build emqx packages (Elixir)
env: env:
@ -406,7 +406,7 @@ jobs:
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--with-elixir \ --with-elixir \
--builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}" --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
- name: create sha256 - name: create sha256
env: env:
@ -440,9 +440,9 @@ jobs:
# NOTE: for docker, only support latest otp and elixir # NOTE: for docker, only support latest otp and elixir
# versions, not a matrix # versions, not a matrix
otp: otp:
- 24.1.5-3 # update to latest - 24.1.5-4 # update to latest
elixir: elixir:
- 1.13.1 # update to latest - 1.13.2 # update to latest
arch: arch:
- amd64 - amd64
- arm64 - arm64
@ -450,8 +450,8 @@ jobs:
- no_elixir - no_elixir
include: include:
- profile: emqx - profile: emqx
otp: 24.1.5-3 otp: 24.1.5-4
elixir: 1.13.1 elixir: 1.13.2
arch: amd64 arch: amd64
build_elixir: with_elixir build_elixir: with_elixir
@ -513,7 +513,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/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14 RUN_FROM=alpine:3.14
EMQX_NAME=${{ matrix.profile }} EMQX_NAME=${{ matrix.profile }}
file: source/deploy/docker/Dockerfile file: source/deploy/docker/Dockerfile
@ -529,7 +529,7 @@ jobs:
tags: ${{ steps.meta-elixir.outputs.tags }} tags: ${{ steps.meta-elixir.outputs.tags }}
labels: ${{ steps.meta-elixir.outputs.labels }} labels: ${{ steps.meta-elixir.outputs.labels }}
build-args: | build-args: |
BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-5:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14
RUN_FROM=alpine:3.14 RUN_FROM=alpine:3.14
EMQX_NAME=emqx-elixir EMQX_NAME=emqx-elixir
file: source/deploy/docker/Dockerfile file: source/deploy/docker/Dockerfile
@ -579,7 +579,7 @@ jobs:
- emqx - emqx
- emqx-enterprise - emqx-enterprise
otp: otp:
- 24.1.5-3 - 24.1.5-4
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

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

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/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 container: ghcr.io/emqx/emqx-builder/5.0-5:1.13.2-24.1.5-4-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -7,7 +7,7 @@ on: [pull_request]
jobs: jobs:
elixir_apps_check: elixir_apps_check:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: hexpm/elixir:1.13.1-erlang-24.2-alpine-3.15.0 container: hexpm/elixir:1.13.2-erlang-24.2-alpine-3.15.0
strategy: strategy:
fail-fast: false fail-fast: false

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

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

2
.github/workflows/elixir_release.yml vendored
View File

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

6
.github/workflows/run_api_tests.yaml vendored
View File

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

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

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

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

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

6
.github/workflows/run_relup_tests.yaml vendored
View File

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

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

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

4
.tool-versions
View File

@ -1,2 +1,2 @@
erlang 24.1.5-3 erlang 24.1.5-4
elixir 1.13.1-otp-24 elixir 1.13.2-otp-24

2
Makefile
View File

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

2
deploy/docker/Dockerfile
View File

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

9
mix.exs
View File

@ -24,13 +24,6 @@ defmodule EMQXUmbrella.MixProject do
Defaults to `community`. Defaults to `community`.
""" """
# Temporary hack while 1.13.2 is not released
System.version()
|> Version.parse!()
|> Version.compare(Version.parse!("1.13.2"))
|> Kernel.==(:lt)
|> if(do: Code.require_file("lib/mix/release.exs"))
def project() do def project() do
[ [
app: :emqx_mix, app: :emqx_mix,
@ -425,7 +418,7 @@ defmodule EMQXUmbrella.MixProject do
# The `:tar` built-in step in Mix Release does not currently add the # The `:tar` built-in step in Mix Release does not currently add the
# `etc` directory into the resulting tarball. The workaround is to # `etc` directory into the resulting tarball. The workaround is to
# add those to the `:overlays` key before running `:tar`. # add those to the `:overlays` key before running `:tar`.
# See: https://hexdocs.pm/mix/1.13.1/Mix.Release.html#__struct__/0 # See: https://hexdocs.pm/mix/1.13.2/Mix.Release.html#__struct__/0
defp prepare_tar_overlays(release) do defp prepare_tar_overlays(release) do
Map.update!(release, :overlays, &["etc", "data" | &1]) Map.update!(release, :overlays, &["etc", "data" | &1])
end end