chore(ci): update emqx-builder image
Uses Elixir 1.13.3 and OTP 24.2.1-1.
This commit is contained in:
parent
278361e6b6
commit
8cac5f6b39
|
@ -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-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:
|
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-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:
|
env_file:
|
||||||
- conf.env
|
- conf.env
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -22,7 +22,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-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:
|
outputs:
|
||||||
DEP_ROCKSDB_REF: ${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
|
DEP_ROCKSDB_REF: ${{ steps.deps-refs.outputs.DEP_ROCKSDB_REF }}
|
||||||
|
@ -108,7 +108,7 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
os:
|
os:
|
||||||
- macos-11
|
- macos-11
|
||||||
- macos-10.15
|
- macos-10.15
|
||||||
|
@ -196,7 +196,7 @@ jobs:
|
||||||
needs: prepare
|
needs: prepare
|
||||||
runs-on: ${{ matrix.build_machine }}
|
runs-on: ${{ matrix.build_machine }}
|
||||||
container:
|
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:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
@ -206,9 +206,9 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
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:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
# 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.
|
||||||
|
@ -255,15 +255,15 @@ jobs:
|
||||||
profile: emqx-enterprise
|
profile: emqx-enterprise
|
||||||
include:
|
include:
|
||||||
- profile: emqx
|
- profile: emqx
|
||||||
otp: 24.1.5-4
|
otp: 24.2.1-1
|
||||||
elixir: 1.13.2
|
elixir: 1.13.3
|
||||||
build_elixir: with_elixir
|
build_elixir: with_elixir
|
||||||
arch: amd64
|
arch: amd64
|
||||||
os: ubuntu20.04
|
os: ubuntu20.04
|
||||||
build_machine: ubuntu-20.04
|
build_machine: ubuntu-20.04
|
||||||
- profile: emqx
|
- profile: emqx
|
||||||
otp: 24.1.5-4
|
otp: 24.2.1-1
|
||||||
elixir: 1.13.2
|
elixir: 1.13.3
|
||||||
build_elixir: with_elixir
|
build_elixir: with_elixir
|
||||||
arch: amd64
|
arch: amd64
|
||||||
os: centos7
|
os: centos7
|
||||||
|
@ -328,7 +328,7 @@ jobs:
|
||||||
--otp "${OTP}" \
|
--otp "${OTP}" \
|
||||||
--elixir "${ELIXIR}" "$WithElixir" \
|
--elixir "${ELIXIR}" "$WithElixir" \
|
||||||
--system "${SYSTEM}" \
|
--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
|
done
|
||||||
- uses: actions/upload-artifact@v1
|
- uses: actions/upload-artifact@v1
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
@ -352,9 +352,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-4 # update to latest
|
- 24.2.1-1 # update to latest
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2 # update to latest
|
- 1.13.3 # update to latest
|
||||||
arch:
|
arch:
|
||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
|
@ -371,8 +371,8 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- os: alpine3.14
|
- os: alpine3.14
|
||||||
profile: emqx
|
profile: emqx
|
||||||
otp: 24.1.5-4
|
otp: 24.2.1-1
|
||||||
elixir: 1.13.2
|
elixir: 1.13.3
|
||||||
arch: amd64
|
arch: amd64
|
||||||
build_elixir: with_elixir
|
build_elixir: with_elixir
|
||||||
build_machine: ubuntu-20.04
|
build_machine: ubuntu-20.04
|
||||||
|
@ -454,7 +454,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-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 }}
|
RUN_FROM=${{ steps.pre-meta.outputs.img }}
|
||||||
EMQX_NAME=${{ steps.pre-meta.outputs.emqx_name }}
|
EMQX_NAME=${{ steps.pre-meta.outputs.emqx_name }}
|
||||||
file: source/deploy/docker/Dockerfile
|
file: source/deploy/docker/Dockerfile
|
||||||
|
@ -496,10 +496,10 @@ jobs:
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
# NOTE: for docker, only support latest otp version, not a matrix
|
# NOTE: for docker, only support latest otp version, not a matrix
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4 # update to latest
|
- 24.2.1-1 # update to latest
|
||||||
#
|
#
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2 # update to latest
|
- 1.13.3 # update to latest
|
||||||
arch:
|
arch:
|
||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64
|
||||||
|
@ -516,8 +516,8 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- os: alpine3.14
|
- os: alpine3.14
|
||||||
profile: emqx
|
profile: emqx
|
||||||
otp: 24.1.5-4
|
otp: 24.2.1-1
|
||||||
elixir: 1.13.2
|
elixir: 1.13.3
|
||||||
arch: amd64
|
arch: amd64
|
||||||
build_elixir: with_elixir
|
build_elixir: with_elixir
|
||||||
build_machine: ubuntu-20.04
|
build_machine: ubuntu-20.04
|
||||||
|
@ -617,7 +617,7 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
include:
|
include:
|
||||||
- profile: emqx
|
- profile: emqx
|
||||||
otp: windows # otp version on windows is rather fixed
|
otp: windows # otp version on windows is rather fixed
|
||||||
|
|
|
@ -36,14 +36,14 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
os:
|
os:
|
||||||
- ubuntu20.04
|
- ubuntu20.04
|
||||||
- centos7
|
- 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:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
|
@ -141,7 +141,7 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
macos:
|
macos:
|
||||||
- macos-11
|
- macos-11
|
||||||
- macos-10.15
|
- macos-10.15
|
||||||
|
|
|
@ -5,7 +5,7 @@ on: [pull_request, push]
|
||||||
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-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:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -7,13 +7,13 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
os:
|
os:
|
||||||
- ubuntu20.04
|
- ubuntu20.04
|
||||||
runs-on: ubuntu-20.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:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -7,7 +7,8 @@ on: [pull_request, push]
|
||||||
jobs:
|
jobs:
|
||||||
elixir_apps_check:
|
elixir_apps_check:
|
||||||
runs-on: ubuntu-20.04
|
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:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
|
@ -30,8 +31,6 @@ jobs:
|
||||||
edition_type: enterprise
|
edition_type: enterprise
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: install
|
|
||||||
run: apk add make bash curl git
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.4.0
|
uses: actions/checkout@v2.4.0
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -7,7 +7,7 @@ on: [pull_request, push]
|
||||||
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-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:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
|
@ -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-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:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
|
@ -18,15 +18,15 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
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-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
|
container: ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -15,19 +15,19 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
otp:
|
otp:
|
||||||
- 23.3.4.9-4
|
- 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
|
# 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.2
|
- 1.13.3
|
||||||
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-5:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
|
container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -16,7 +16,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-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:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
@ -50,9 +50,9 @@ jobs:
|
||||||
os:
|
os:
|
||||||
- alpine3.14
|
- alpine3.14
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
arch:
|
arch:
|
||||||
- amd64
|
- amd64
|
||||||
exclude:
|
exclude:
|
||||||
|
@ -91,7 +91,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-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
|
EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
|
||||||
run: |
|
run: |
|
||||||
make ${{ matrix.profile }}-docker
|
make ${{ matrix.profile }}-docker
|
||||||
- name: run emqx
|
- name: run emqx
|
||||||
|
@ -134,9 +134,9 @@ jobs:
|
||||||
os:
|
os:
|
||||||
- alpine3.14
|
- alpine3.14
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
arch:
|
arch:
|
||||||
- amd64
|
- amd64
|
||||||
# - emqx-enterprise # TODO test enterprise
|
# - emqx-enterprise # TODO test enterprise
|
||||||
|
@ -170,7 +170,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-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
|
EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-7:${{ 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
|
||||||
|
|
|
@ -21,19 +21,19 @@ jobs:
|
||||||
- emqx
|
- emqx
|
||||||
- emqx-enterprise
|
- emqx-enterprise
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
# 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.2
|
- 1.13.3
|
||||||
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-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
|
container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
|
|
|
@ -18,16 +18,16 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
otp:
|
otp:
|
||||||
- 24.1.5-4
|
- 24.2.1-1
|
||||||
elixir:
|
elixir:
|
||||||
- 1.13.2
|
- 1.13.3
|
||||||
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-5:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
|
container: "ghcr.io/emqx/emqx-builder/5.0-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
erlang 24.1.5-4
|
erlang 24.2.1-1
|
||||||
elixir 1.13.2-otp-24
|
elixir 1.13.3-otp-24
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -4,7 +4,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/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 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)
|
||||||
|
|
|
@ -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
|
ARG RUN_FROM=alpine:3.14
|
||||||
FROM ${BUILD_FROM} AS builder
|
FROM ${BUILD_FROM} AS builder
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue