diff --git a/.ci/apps_tests/docker-compose.yaml b/.ci/apps_tests/docker-compose.yaml index 1c0d781e3..d834da5b2 100644 --- a/.ci/apps_tests/docker-compose.yaml +++ b/.ci/apps_tests/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 depends_on: - mysql_server - redis_server diff --git a/.ci/build_packages/Dockerfile b/.ci/build_packages/Dockerfile index a950d2a28..adfbb82a2 100644 --- a/.ci/build_packages/Dockerfile +++ b/.ci/build_packages/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl22.3-ubuntu20.04 +ARG BUILD_FROM=emqx/build-env:erl22.3.4.13-ubuntu20.04 FROM ${BUILD_FROM} ARG EMQX_NAME=emqx diff --git a/.ci/compatibility_tests/docker-compose-ldap.yaml b/.ci/compatibility_tests/docker-compose-ldap.yaml index c41719b8a..1bbdfe2aa 100644 --- a/.ci/compatibility_tests/docker-compose-ldap.yaml +++ b/.ci/compatibility_tests/docker-compose-ldap.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 depends_on: - ldap_server networks: diff --git a/.ci/compatibility_tests/docker-compose-mongo-tls.yaml b/.ci/compatibility_tests/docker-compose-mongo-tls.yaml index fed0d60d8..a22642a24 100644 --- a/.ci/compatibility_tests/docker-compose-mongo-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-mongo-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mongo.yaml b/.ci/compatibility_tests/docker-compose-mongo.yaml index ec6310eac..8385f1fb0 100644 --- a/.ci/compatibility_tests/docker-compose-mongo.yaml +++ b/.ci/compatibility_tests/docker-compose-mongo.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml index 566240787..50de346c2 100644 --- a/.ci/compatibility_tests/docker-compose-mysql-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-mysql-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mysql.yaml b/.ci/compatibility_tests/docker-compose-mysql.yaml index d49c51977..f7a1b5d39 100644 --- a/.ci/compatibility_tests/docker-compose-mysql.yaml +++ b/.ci/compatibility_tests/docker-compose-mysql.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml b/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml index c7daf1e38..ff26d88bd 100644 --- a/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-pgsql-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-pgsql.yaml b/.ci/compatibility_tests/docker-compose-pgsql.yaml index a1f578eaa..f76768e8e 100644 --- a/.ci/compatibility_tests/docker-compose-pgsql.yaml +++ b/.ci/compatibility_tests/docker-compose-pgsql.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml index 0048d94f5..592f857cc 100644 --- a/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-cluster-tls.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-cluster.yaml b/.ci/compatibility_tests/docker-compose-redis-cluster.yaml index 01d4b7cb7..fa4a93d90 100644 --- a/.ci/compatibility_tests/docker-compose-redis-cluster.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-cluster.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml b/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml index 54c621130..2cc3743c0 100644 --- a/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml @@ -5,7 +5,7 @@ version: '2.4' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml index 643f18755..22d44a035 100644 --- a/.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-singer-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-singer.yaml b/.ci/compatibility_tests/docker-compose-redis-singer.yaml index 2f7c73d53..bc9b01d12 100644 --- a/.ci/compatibility_tests/docker-compose-redis-singer.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-singer.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3 + image: erlang:22.3.4.13 volumes: - ../..:/emqx networks: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 108ac29e0..8beaa9e57 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -153,13 +153,15 @@ jobs: docker run --rm --privileged tonistiigi/binfmt --install all - uses: actions/checkout@v1 - name: get deps + env: + ERL_OTP: erl22.3.4.13 run: | docker run -i --rm \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_REF=$GITHUB_REF \ -v $(pwd):/emqx \ -w /emqx \ - emqx/build-env:erl22.3-debian10 \ + emqx/build-env:${ERL_OTP}-debian10 \ bash -c "make deps-all" - name: downloads emqx zip packages env: @@ -188,7 +190,7 @@ jobs: - name: build emqx packages if: (matrix.arch == 'amd64' && matrix.emqx == 'emqx') || startsWith(github.ref, 'refs/tags/') env: - ERL_OTP: erl22.3 + ERL_OTP: erl22.3.4.13 EMQX: ${{ matrix.emqx }} ARCH: ${{ matrix.arch }} SYSTEM: ${{ matrix.os }} @@ -241,13 +243,15 @@ jobs: steps: - uses: actions/checkout@v1 - name: get deps + env: + ERL_OTP: erl22.3.4.13 run: | docker run -i --rm \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \ -e GITHUB_REF=$GITHUB_REF \ -v $(pwd):/emqx \ -w /emqx \ - emqx/build-env:erl22.3-alpine-amd64 \ + emqx/build-env:${ERL_OTP}-alpine-amd64 \ sh -c "make deps-emqx" - name: build emqx docker image env: diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index c76108633..e8ca663ea 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -111,7 +111,7 @@ jobs: relup_test: runs-on: ubuntu-20.04 - container: emqx/build-env:erl22.3-ubuntu20.04 + container: emqx/build-env:erl22.3.4.13-ubuntu20.04 defaults: run: shell: bash