From 4cbd23bd46fd047609b2096fc15c53fa719faa37 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 12 Jan 2022 20:09:49 -0300 Subject: [PATCH] chore(ci): use new tagged image with elixir --- .ci/docker-compose-file/docker-compose.yaml | 6 ++--- .github/workflows/build_packages.yaml | 27 +++++++++++++-------- .github/workflows/build_slim_packages.yaml | 3 +-- .github/workflows/check_deps_integrity.yaml | 3 +-- .github/workflows/elixir_release.yml | 3 +-- .github/workflows/run_api_tests.yaml | 3 +-- .github/workflows/run_emqx_app_tests.yaml | 3 +-- .github/workflows/run_fvt_tests.yaml | 13 +++++----- .github/workflows/run_relup_tests.yaml | 3 +-- Makefile | 3 +-- deploy/docker/Dockerfile | 3 +-- 11 files changed, 34 insertions(+), 36 deletions(-) diff --git a/.ci/docker-compose-file/docker-compose.yaml b/.ci/docker-compose-file/docker-compose.yaml index 664d2327a..ea2de3356 100644 --- a/.ci/docker-compose-file/docker-compose.yaml +++ b/.ci/docker-compose-file/docker-compose.yaml @@ -3,8 +3,7 @@ version: '3.9' services: erlang23: container_name: erlang23 - # FIXME: use tagged version once merged - image: ghcr.io/emqx/emqx-builder/elixir:1.13.1-23.3.4.9-3-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 env_file: - conf.env environment: @@ -24,8 +23,7 @@ services: erlang24: container_name: erlang24 - # FIXME: use tagged version once merged - image: ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-ubuntu20.04 + image: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04 env_file: - conf.env environment: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 40573fb96..5cec355b7 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -19,8 +19,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - # FIXME: use tagged version once merged - container: "ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-ubuntu20.04" + container: "ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-ubuntu20.04" outputs: old_vsns: ${{ steps.find_old_versons.outputs.old_vsns }} @@ -348,7 +347,6 @@ jobs: SYSTEM: ${{ matrix.os }} if: ${{ matrix.build_elixir == 'no_elixir' }} working-directory: source - # FIXME: use tagged version once merged run: | ./scripts/buildx.sh \ --profile "${PROFILE}" \ @@ -357,7 +355,7 @@ jobs: --otp "${OTP}" \ --elixir "${ELIXIR}" \ --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 ./scripts/buildx.sh \ --profile "${PROFILE}" \ @@ -366,7 +364,7 @@ jobs: --otp "${OTP}" \ --elixir "${ELIXIR}" \ --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) env: @@ -377,16 +375,26 @@ jobs: SYSTEM: ${{ matrix.os }} working-directory: source if: ${{ matrix.build_elixir == 'with_elixir' }} - # FIXME: use tagged version once merged run: | ./scripts/buildx.sh \ --profile "${PROFILE}" \ - --pkgtype "elixirpkg" \ + --pkgtype "zip" \ --arch "${ARCH}" \ --otp "${OTP}" \ --elixir "${ELIXIR}" \ --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 env: @@ -466,8 +474,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - # FIXME: use tagged version once merged - BUILD_FROM=ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 + BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-alpine3.14 RUN_FROM=alpine:3.14 EMQX_NAME=${{ matrix.profile }} file: source/deploy/docker/Dockerfile diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index cd3e04abe..2d1ed4731 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -41,8 +41,7 @@ jobs: - ubuntu20.04 - centos7 - # FIXME: use tagged version once merged - container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/check_deps_integrity.yaml b/.github/workflows/check_deps_integrity.yaml index 9fbacd84a..60bd4aac3 100644 --- a/.github/workflows/check_deps_integrity.yaml +++ b/.github/workflows/check_deps_integrity.yaml @@ -5,8 +5,7 @@ on: [pull_request] jobs: check_deps_integrity: runs-on: ubuntu-20.04 - # FIXME: use tagged version once merged - container: ghcr.io/emqx/emqx-builder/elixir:1.13.1-23.3.4.9-3-ubuntu20.04 + container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/elixir_release.yml b/.github/workflows/elixir_release.yml index f46989f77..dc41f7417 100644 --- a/.github/workflows/elixir_release.yml +++ b/.github/workflows/elixir_release.yml @@ -12,8 +12,7 @@ on: jobs: build: runs-on: ubuntu-latest - # FIXME: use tagged version once merged - container: ghcr.io/emqx/emqx-builder/elixir:1.13.1-23.3.4.9-3-ubuntu20.04 + container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-23.3.4.9-3-ubuntu20.04 steps: - name: Checkout diff --git a/.github/workflows/run_api_tests.yaml b/.github/workflows/run_api_tests.yaml index 2f62a93f3..31093b67b 100644 --- a/.github/workflows/run_api_tests.yaml +++ b/.github/workflows/run_api_tests.yaml @@ -24,8 +24,7 @@ jobs: arch: - amd64 runs-on: ubuntu-latest - # FIXME: use tagged version once merged - container: ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} + container: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml index 9a2f650e5..77e753483 100644 --- a/.github/workflows/run_emqx_app_tests.yaml +++ b/.github/workflows/run_emqx_app_tests.yaml @@ -25,8 +25,7 @@ jobs: - amd64 runs-on: ubuntu-20.04 - # FIXME: use tagged version once merged - container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir}}-${{ matrix.otp }}-${{ matrix.os }}" steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f40407bad..496000534 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -14,8 +14,7 @@ jobs: prepare: runs-on: ubuntu-20.04 # prepare source with any OTP version, no need for a matrix - # FIXME: use tagged version once merged - container: ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-alpine3.14 + container: ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14 steps: - uses: actions/checkout@v2 @@ -50,6 +49,8 @@ jobs: - alpine3.14 otp: - 24.1.5-3 + elixir: + - 1.13.1 arch: - amd64 exclude: @@ -84,8 +85,7 @@ jobs: - name: make docker image working-directory: source env: - # FIXME: use tagged version once merged - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/elixir:1.13.1-${{ matrix.otp }}-${{ matrix.os }} + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} run: | make ${{ matrix.profile }}-docker - name: run emqx @@ -126,6 +126,8 @@ jobs: - alpine3.14 otp: - 24.1.5-3 + elixir: + - 1.13.1 arch: - amd64 # - emqx-enterprise # TODO test enterprise @@ -159,8 +161,7 @@ jobs: - name: make docker image working-directory: source env: - # FIXME: use tagged version once merged - EMQX_BUILDER: ghcr.io/emqx/emqx-builder/elixir:1.13.1-${{ matrix.otp }}-${{ matrix.os }} + EMQX_BUILDER: ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }} run: | make ${{ matrix.profile }}-docker echo "TARGET=emqx/${{ matrix.profile }}" >> $GITHUB_ENV diff --git a/.github/workflows/run_relup_tests.yaml b/.github/workflows/run_relup_tests.yaml index 865f9ec94..9284eb912 100644 --- a/.github/workflows/run_relup_tests.yaml +++ b/.github/workflows/run_relup_tests.yaml @@ -31,8 +31,7 @@ jobs: - amd64 runs-on: ubuntu-20.04 - # FIXME: use tagged version once merged - container: "ghcr.io/emqx/emqx-builder/elixir:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" + container: "ghcr.io/emqx/emqx-builder/5.0-4:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}" defaults: run: diff --git a/Makefile b/Makefile index 61f62d7ac..4d6cc6032 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,7 @@ REBAR_VERSION = 3.16.1-emqx-1 REBAR = $(CURDIR)/rebar3 BUILD = $(CURDIR)/build SCRIPTS = $(CURDIR)/scripts -# FIXME: use tagged version once merged -export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-alpine3.14 +export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-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) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index c83f8ce87..e4abad035 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,5 +1,4 @@ -# FIXME: use tagged version once merged -ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/elixir:1.13.1-24.1.5-3-alpine3.14 +ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0-4:1.13.1-24.1.5-3-alpine3.14 ARG RUN_FROM=alpine:3.14 FROM ${BUILD_FROM} AS builder