diff --git a/.ci/apps_tests/docker-compose.yaml b/.ci/apps_tests/docker-compose.yaml index d834da5b2..aadb55245 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 depends_on: - mysql_server - redis_server @@ -82,7 +82,7 @@ services: build: context: ../.. dockerfile: .ci/apps_tests/openldap/Dockerfile - args: + args: LDAP_TAG: ${LDAP_TAG} image: emqx-ldap:1.0 ports: diff --git a/.ci/build_packages/Dockerfile b/.ci/build_packages/Dockerfile index adfbb82a2..197b7e731 100644 --- a/.ci/build_packages/Dockerfile +++ b/.ci/build_packages/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl22.3.4.13-ubuntu20.04 +ARG BUILD_FROM=emqx/build-env:erl23.2.2-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 1bbdfe2aa..33b37e00c 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 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 a22642a24..1611534f6 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx @@ -14,7 +14,7 @@ services: tty: true mongo_server: - container_name: mongo + container_name: mongo image: mongo:${MONGO_TAG} restart: always environment: diff --git a/.ci/compatibility_tests/docker-compose-mongo.yaml b/.ci/compatibility_tests/docker-compose-mongo.yaml index 8385f1fb0..2f769ac63 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 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 50de346c2..8117907f5 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-mysql.yaml b/.ci/compatibility_tests/docker-compose-mysql.yaml index f7a1b5d39..1f285cc5e 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 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 ff26d88bd..d3d9d93b5 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../../:/emqx working_dir: /emqx diff --git a/.ci/compatibility_tests/docker-compose-pgsql.yaml b/.ci/compatibility_tests/docker-compose-pgsql.yaml index f76768e8e..c5492d971 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 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 592f857cc..06518854f 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-cluster.yaml b/.ci/compatibility_tests/docker-compose-redis-cluster.yaml index fa4a93d90..213a06866 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml b/.ci/compatibility_tests/docker-compose-redis-sentinel.yaml index 2cc3743c0..b2b58fefe 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.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml b/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml index 22d44a035..03d643754 100644 --- a/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-single-tls.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../..:/emqx networks: @@ -14,7 +14,7 @@ services: tty: true redis_server: - container_name: redis + container_name: redis image: redis:${REDIS_TAG} volumes: - ../../apps/emqx_auth_redis/test/emqx_auth_redis_SUITE_data/certs:/tls diff --git a/.ci/compatibility_tests/docker-compose-redis-single.yaml b/.ci/compatibility_tests/docker-compose-redis-single.yaml index bc9b01d12..5d7acb865 100644 --- a/.ci/compatibility_tests/docker-compose-redis-single.yaml +++ b/.ci/compatibility_tests/docker-compose-redis-single.yaml @@ -3,7 +3,7 @@ version: '3' services: erlang: container_name: erlang - image: erlang:22.3.4.13 + image: emqx/build-env:erl23.2.2-ubuntu20.04 volumes: - ../..:/emqx networks: diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index cfe434961..4668113b1 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -22,7 +22,7 @@ jobs: - uses: gleam-lang/setup-erlang@v1.1.0 id: install_erlang with: - otp-version: 22.3 + otp-version: 23.2 - name: build run: | # set-executionpolicy remotesigned -s cu @@ -81,11 +81,11 @@ jobs: git config --global credential.helper store - name: build erlang run: | - kerl build 22.3.4.13 - kerl install 22.3.4.13 $HOME/.kerl/22.3.4.13 + kerl build 23.2.2 + kerl install 23.2.2 $HOME/.kerl/23.2.2 - name: build run: | - . $HOME/.kerl/22.3.4.13/activate + . $HOME/.kerl/23.2.2/activate make emqx-pkg - name: test run: | @@ -155,7 +155,7 @@ jobs: - uses: actions/checkout@v1 - name: get deps env: - ERL_OTP: erl22.3.4.13 + ERL_OTP: erl23.2.2 run: | docker run -i --rm \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \ @@ -191,7 +191,7 @@ jobs: - name: build emqx packages if: (matrix.arch == 'amd64' && matrix.emqx == 'emqx') || startsWith(github.ref, 'refs/tags/') env: - ERL_OTP: erl22.3.4.13 + ERL_OTP: erl23.2.2 EMQX: ${{ matrix.emqx }} ARCH: ${{ matrix.arch }} SYSTEM: ${{ matrix.os }} @@ -245,7 +245,7 @@ jobs: - uses: actions/checkout@v1 - name: get deps env: - ERL_OTP: erl22.3.4.13 + ERL_OTP: erl23.2.2 run: | docker run -i --rm \ -e GITHUB_RUN_ID=$GITHUB_RUN_ID \ diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index fd2c55f05..761daa237 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -117,7 +117,7 @@ jobs: relup_test: runs-on: ubuntu-20.04 - container: emqx/build-env:erl22.3.4.13-ubuntu20.04 + container: emqx/build-env:erl23.2.2-ubuntu20.04 defaults: run: shell: bash diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 779e3266e..23b04677d 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=emqx/build-env:erl22.3-alpine-amd64 +ARG BUILD_FROM=emqx/build-env:erl23.2.2-alpine-amd64 ARG RUN_FROM=alpine:3.11 FROM ${BUILD_FROM} AS builder diff --git a/docker.mk b/docker.mk index 322b77b38..60e96ae39 100644 --- a/docker.mk +++ b/docker.mk @@ -21,7 +21,7 @@ docker-prepare: # @echo "PREPARE: Setting up dependencies." # @apt update -y # @apt install --only-upgrade docker-ce -y - + ## Update docker configuration to enable docker manifest command @echo "PREPARE: Updating docker configuration" @mkdir -p $$HOME/.docker @@ -45,7 +45,7 @@ docker-build: ## Prepare qemu to build images other then x86_64 on travis @echo "PREPARE: Qemu" \ && docker run --rm --privileged multiarch/qemu-user-static:register --reset - + @mkdir -p tmp \ && cd tmp \ && curl -L -o qemu-$(QEMU_ARCH)-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-$(QEMU_ARCH)-static.tar.gz \ @@ -54,7 +54,7 @@ docker-build: @docker build --no-cache \ --build-arg PKG_VSN=$(PKG_VSN) \ - --build-arg BUILD_FROM=emqx/build-env:erl22.3-alpine-$(ARCH) \ + --build-arg BUILD_FROM=emqx/build-env:erl23.2.2-alpine-$(ARCH) \ --build-arg RUN_FROM=$(ARCH)/alpine:3.11 \ --build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \