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

chore(CI): rename image

This commit is contained in:
zhanghongtong 2021-10-21 09:19:53 +08:00 committed by Rory Z
parent ece97aa679
commit f817ba0075
11 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ version: '3.9'
services: services:
erlang23: erlang23:
container_name: erlang23 container_name: erlang23
image: ghcr.io/emqx/emqx-builder-helper/5.0:23.2.7.2-emqx-2-ubuntu20.04 image: ghcr.io/emqx/emqx-builder/5.0:23.2.7.2-emqx-2-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:
@ -23,7 +23,7 @@ services:
erlang24: erlang24:
container_name: erlang24 container_name: erlang24
image: ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-ubuntu20.04 image: ghcr.io/emqx/emqx-builder/5.0:24.1.1-emqx-1-ubuntu20.04
env_file: env_file:
- conf.env - conf.env
environment: environment:

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

@ -21,7 +21,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
outputs: outputs:
profiles: ${{ steps.set_profile.outputs.profiles }} profiles: ${{ steps.set_profile.outputs.profiles }}
@ -320,7 +320,7 @@ jobs:
-v $(pwd):/emqx \ -v $(pwd):/emqx \
--workdir /emqx \ --workdir /emqx \
--platform linux/$ARCH \ --platform linux/$ARCH \
ghcr.io/emqx/emqx-builder-helper/5.0:$OTP-$SYSTEM \ ghcr.io/emqx/emqx-builder/5.0:$OTP-$SYSTEM \
bash -euc "make $PROFILE-zip || cat rebar3.crashdump; \ bash -euc "make $PROFILE-zip || cat rebar3.crashdump; \
make $PROFILE-pkg || cat rebar3.crashdump; \ make $PROFILE-pkg || cat rebar3.crashdump; \
EMQX_NAME=$PROFILE && .ci/build_packages/tests.sh" EMQX_NAME=$PROFILE && .ci/build_packages/tests.sh"
@ -391,7 +391,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: |
BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-alpine3.14 BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0:${{ 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

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

@ -26,7 +26,7 @@ jobs:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-${{ matrix.os }}" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-${{ matrix.os }}"
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1

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: "ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:24.1.1-emqx-1-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -14,7 +14,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: "ghcr.io/emqx/emqx-builder-helper/5.0:23.2.7.2-emqx-2-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:23.2.7.2-emqx-2-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -16,7 +16,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

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

@ -20,7 +20,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
outputs: outputs:
profile: ${{ steps.profile.outputs.profile }} profile: ${{ steps.profile.outputs.profile }}

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

@ -20,7 +20,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
defaults: defaults:
run: run:

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

@ -20,7 +20,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -43,7 +43,7 @@ jobs:
- "24.1.1-emqx-1" - "24.1.1-emqx-1"
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
container: "ghcr.io/emqx/emqx-builder-helper/5.0:${{ matrix.otp }}-ubuntu20.04" container: "ghcr.io/emqx/emqx-builder/5.0:${{ matrix.otp }}-ubuntu20.04"
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

2
build
View File

@ -149,7 +149,7 @@ make_docker() {
echo "DOCKER BUILD: docker repo -> emqx/$PROFILE " echo "DOCKER BUILD: docker repo -> emqx/$PROFILE "
docker build --no-cache \ docker build --no-cache \
--build-arg BUILD_FROM="ghcr.io/emqx/emqx-builder-helper/5.0:${OTP:-24.1.1-emqx-1}-alpine3.14" \ --build-arg BUILD_FROM="ghcr.io/emqx/emqx-builder/5.0:${OTP:-24.1.1-emqx-1}-alpine3.14" \
--build-arg RUN_FROM="alpine:3.14" \ --build-arg RUN_FROM="alpine:3.14" \
--build-arg EMQX_NAME="$PROFILE" \ --build-arg EMQX_NAME="$PROFILE" \
--tag "emqx/$PROFILE:$PKG_VSN" \ --tag "emqx/$PROFILE:$PKG_VSN" \

2
deploy/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/emqx/emqx-builder-helper/5.0:24.1.1-emqx-1-alpine3.14 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.0:24.1.1-emqx-1-alpine3.14
ARG RUN_FROM=alpine:3.14 ARG RUN_FROM=alpine:3.14
FROM ${BUILD_FROM} AS builder FROM ${BUILD_FROM} AS builder