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

chore(ci): use new tagged image with elixir

This commit is contained in:
Thales Macedo Garitezi 2022-01-12 20:09:49 -03:00
parent 4f05a89848
commit 4cbd23bd46
No known key found for this signature in database
GPG Key ID: DD279F8152A9B6DD
11 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,7 @@ version: '3.9'
services: services:
erlang23: erlang23:
container_name: erlang23 container_name: erlang23
# FIXME: use tagged version once merged 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/elixir:1.13.1-23.3.4.9-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:
@ -24,8 +23,7 @@ services:
erlang24: erlang24:
container_name: erlang24 container_name: erlang24
# FIXME: use tagged version once merged image: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04
image: ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

@ -19,8 +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
# FIXME: use tagged version once merged container: "ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04"
container: "ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-ubuntu20.04"
outputs: outputs:
old_vsns: ${{ steps.find_old_versons.outputs.old_vsns }} old_vsns: ${{ steps.find_old_versons.outputs.old_vsns }}
@ -348,7 +347,6 @@ jobs:
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}
if: ${{ matrix.build_elixir == 'no_elixir' }} if: ${{ matrix.build_elixir == 'no_elixir' }}
working-directory: source working-directory: source
# FIXME: use tagged version once merged
run: | run: |
./scripts/buildx.sh \ ./scripts/buildx.sh \
--profile "${PROFILE}" \ --profile "${PROFILE}" \
@ -357,7 +355,7 @@ jobs:
--otp "${OTP}" \ --otp "${OTP}" \
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/elixir:${ELIXIR}-${OTP}-${SYSTEM}" --builder "ghcr.io/emqx/emqx-builder/5.0-4:${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}" \
@ -366,7 +364,7 @@ jobs:
--otp "${OTP}" \ --otp "${OTP}" \
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/elixir:${ELIXIR}-${OTP}-${SYSTEM}" --builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}"
- name: build emqx packages (Elixir) - name: build emqx packages (Elixir)
env: env:
@ -377,16 +375,26 @@ jobs:
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}
working-directory: source working-directory: source
if: ${{ matrix.build_elixir == 'with_elixir' }} if: ${{ matrix.build_elixir == 'with_elixir' }}
# FIXME: use tagged version once merged
run: | run: |
./scripts/buildx.sh \ ./scripts/buildx.sh \
--profile "${PROFILE}" \ --profile "${PROFILE}" \
--pkgtype "elixirpkg" \ --pkgtype "zip" \
--arch "${ARCH}" \ --arch "${ARCH}" \
--otp "${OTP}" \ --otp "${OTP}" \
--elixir "${ELIXIR}" \ --elixir "${ELIXIR}" \
--system "${SYSTEM}" \ --system "${SYSTEM}" \
--builder "ghcr.io/emqx/emqx-builder/elixir:${ELIXIR}-${OTP}-${SYSTEM}" --with-elixir \
--builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}"
./scripts/buildx.sh \
--profile "${PROFILE}" \
--pkgtype "pkg" \
--arch "${ARCH}" \
--otp "${OTP}" \
--elixir "${ELIXIR}" \
--system "${SYSTEM}" \
--with-elixir \
--builder "ghcr.io/emqx/emqx-builder/5.0-4:${ELIXIR}-${OTP}-${SYSTEM}"
- name: create sha256 - name: create sha256
env: env:
@ -466,8 +474,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: |
# FIXME: use tagged version once merged BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14
BUILD_FROM=ghcr.io/emqx/emqx-builder/elixir:${{ 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

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

@ -41,8 +41,7 @@ jobs:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
# FIXME: use tagged version once merged container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

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

@ -5,8 +5,7 @@ on: [pull_request]
jobs: jobs:
check_deps_integrity: check_deps_integrity:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
# FIXME: use tagged version once merged 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/elixir:1.13.1-23.3.4.9-3-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -12,8 +12,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
# FIXME: use tagged version once merged 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/elixir:1.13.1-23.3.4.9-3-ubuntu20.04
steps: steps:
- name: Checkout - name: Checkout

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

@ -24,8 +24,7 @@ jobs:
arch: arch:
- amd64 - amd64
runs-on: ubuntu-latest runs-on: ubuntu-latest
# FIXME: use tagged version once merged container: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
container: ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -25,8 +25,7 @@ jobs:
- amd64 - amd64
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
# FIXME: use tagged version once merged container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -14,8 +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
# FIXME: use tagged version once merged container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14
container: ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-alpine3.14
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -50,6 +49,8 @@ jobs:
- alpine3.14 - alpine3.14
otp: otp:
- 24.1.5-3 - 24.1.5-3
elixir:
- 1.13.1
arch: arch:
- amd64 - amd64
exclude: exclude:
@ -84,8 +85,7 @@ jobs:
- name: make docker image - name: make docker image
working-directory: source working-directory: source
env: env:
# FIXME: use tagged version once merged EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
EMQX_BUILDER: ghcr.io/emqx/emqx-builder/elixir:1.13.1-${{ matrix.otp }}-${{ matrix.os }}
run: | run: |
make ${{ matrix.profile }}-docker make ${{ matrix.profile }}-docker
- name: run emqx - name: run emqx
@ -126,6 +126,8 @@ jobs:
- alpine3.14 - alpine3.14
otp: otp:
- 24.1.5-3 - 24.1.5-3
elixir:
- 1.13.1
arch: arch:
- amd64 - amd64
# - emqx-enterprise # TODO test enterprise # - emqx-enterprise # TODO test enterprise
@ -159,8 +161,7 @@ jobs:
- name: make docker image - name: make docker image
working-directory: source working-directory: source
env: env:
# FIXME: use tagged version once merged EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
EMQX_BUILDER: ghcr.io/emqx/emqx-builder/elixir:1.13.1-${{ 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

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

@ -31,8 +31,7 @@ jobs:
- amd64 - amd64
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
# FIXME: use tagged version once merged container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}"
defaults: defaults:
run: run:

3
Makefile
View File

@ -3,8 +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
# FIXME: use tagged version once merged 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/elixir:1.13.1-24.1.5-3-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)

3
deploy/docker/Dockerfile
View File

@ -1,5 +1,4 @@
# FIXME: use tagged version once merged 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/elixir:1.13.1-24.1.5-3-alpine3.14
ARG RUN_FROM=alpine:3.14 ARG RUN_FROM=alpine:3.14
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder