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

chore(build): Pin Erlang/OTP 23.2.7.1-emqx-1

This commit is contained in:
Zaiming Shi 2021-04-16 20:15:11 +02:00 committed by Zaiming (Stone) Shi
parent 7ba255a301
commit 5c49d5e49d
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/build_packages/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=emqx/build-env:erl23.2.7-ubuntu20.04 ARG BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx

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

@ -3,7 +3,7 @@ version: '3.9'
services: services:
erlang: erlang:
container_name: erlang container_name: erlang
image: emqx/build-env:erl23.2.7-ubuntu20.04 image: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

@ -15,7 +15,7 @@ on:
jobs: jobs:
prepare: prepare:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7-ubuntu20.04 container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles}} profiles: ${{ steps.set_profile.outputs.profiles}}
@ -267,7 +267,7 @@ jobs:
cd - cd -
- name: build emqx packages - name: build emqx packages
env: env:
ERL_OTP: erl23.2.7 ERL_OTP: erl23.2.7.1-emqx-1
PROFILE: ${{ matrix.profile }} PROFILE: ${{ matrix.profile }}
ARCH: ${{ matrix.arch }} ARCH: ${{ matrix.arch }}
SYSTEM: ${{ matrix.os }} SYSTEM: ${{ matrix.os }}

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

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
erl_otp: erl_otp:
- erl23.2.7 - erl23.2.7.1-emqx-1
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7

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

@ -5,7 +5,7 @@ on: [pull_request]
jobs: jobs:
check_deps_integrity: check_deps_integrity:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7-ubuntu20.04 container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -154,7 +154,7 @@ jobs:
relup_test: relup_test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7-ubuntu20.04 container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
defaults: defaults:
run: run:
shell: bash shell: bash

4
.github/workflows/run_test_cases.yaml vendored
View File

@ -13,7 +13,7 @@ on:
jobs: jobs:
run_static_analysis: run_static_analysis:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7-ubuntu20.04 container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -30,7 +30,7 @@ jobs:
run_proper_test: run_proper_test:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: emqx/build-env:erl23.2.7-ubuntu20.04 container: emqx/build-env:erl23.2.7.1-emqx-1-ubuntu20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=emqx/build-env:erl23.2.7-alpine-amd64 ARG BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-alpine-amd64
ARG RUN_FROM=alpine:3.12 ARG RUN_FROM=alpine:3.12
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder

2
docker.mk
View File

@ -62,7 +62,7 @@ docker-build:
@docker build --no-cache \ @docker build --no-cache \
--build-arg PKG_VSN=$(PKG_VSN) \ --build-arg PKG_VSN=$(PKG_VSN) \
--build-arg BUILD_FROM=emqx/build-env:erl23.2.7-alpine-$(ARCH) \ --build-arg BUILD_FROM=emqx/build-env:erl23.2.7.1-emqx-1-alpine-$(ARCH) \
--build-arg RUN_FROM=$(ARCH)/alpine:3.12 \ --build-arg RUN_FROM=$(ARCH)/alpine:3.12 \
--build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg EMQX_NAME=$(EMQX_NAME) \
--build-arg QEMU_ARCH=$(QEMU_ARCH) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \