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

ci: fix make docker error for github action

This commit is contained in:
zhanghongtong 2021-11-16 11:27:05 +08:00
parent 755dd11b07
commit a178b6cc08
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/run_automate_tests.yaml vendored
View File

@ -10,11 +10,6 @@ on:
jobs:
build:
strategy:
matrix:
otp:
- 23.3.4.8-1
runs-on: ubuntu-latest
outputs:
imgname: ${{ steps.prepare.outputs.imgname}}
@ -37,6 +32,8 @@ jobs:
echo "::set-output name=version::$(./pkg-vsn.sh)"
fi
- name: build docker image
env:
OTP_VSN: 23.3.4.9-2
run: |
make ${{ steps.prepare.outputs.imgname }}-docker
docker save emqx/${{ steps.prepare.outputs.imgname }}:${{ steps.prepare.outputs.version }} -o image.tar.gz

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

@ -13,10 +13,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- uses: gleam-lang/setup-erlang@v1.1.2
id: install_erlang
with:
otp-version: 23.2
- name: prepare
run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -24,6 +20,7 @@ jobs:
git config --global credential.helper store
echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
make deps-emqx-ee
make clean
echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV
echo "PROFILE=emqx-ee" >> $GITHUB_ENV
echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV
@ -33,6 +30,8 @@ jobs:
echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV
fi
- name: make emqx image
env:
OTP_VSN: 23.3.4.9-2
run: make ${PROFILE}-docker
- name: run emqx
timeout-minutes: 5
@ -69,10 +68,6 @@ jobs:
steps:
- uses: actions/checkout@v1
- uses: gleam-lang/setup-erlang@v1.1.2
id: install_erlang
with:
otp-version: 23.2
- name: prepare
run: |
if make emqx-ee --dry-run > /dev/null 2>&1; then
@ -80,6 +75,7 @@ jobs:
git config --global credential.helper store
echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
make deps-emqx-ee
make clean
echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV
echo "PROFILE=emqx-ee" >> $GITHUB_ENV
echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV
@ -89,6 +85,8 @@ jobs:
echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV
fi
- name: make emqx image
env:
OTP_VSN: 23.3.4.9-2
run: make ${PROFILE}-docker
- name: install k3s
env:

14
build
View File

@ -12,10 +12,6 @@ ARTIFACT="$2"
# ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
EMQX_RUNNER_IMAGE='alpine:3.14'
EMQX_RUNNER_IMAGE_COMPACT="$(echo $EMQX_RUNNER_IMAGE | tr -d ':')"
EMQX_BUILDER="${EMQX_BUILDER:-ghcr.io/emqx/emqx-builder/4.4-1:${OTP_VSN}-${EMQX_RUNNER_IMAGE_COMPACT}}"
PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
export PKG_VSN
@ -129,14 +125,20 @@ make_zip() {
}
make_docker() {
EMQX_RUNNER_IMAGE='alpine:3.14'
EMQX_RUNNER_IMAGE_COMPACT="$(echo $EMQX_RUNNER_IMAGE | tr -d ':')"
EMQX_BUILDER="${EMQX_BUILDER:-ghcr.io/emqx/emqx-builder/4.4-1:${OTP_VSN}-${EMQX_RUNNER_IMAGE_COMPACT}}"
## Build Docker image
echo "DOCKER BUILD: Build Docker image."
echo "DOCKER BUILD: build version -> $PKG_VSN."
echo "DOCKER BUILD: docker repo -> emqx/$PROFILE "
echo "DOCKER BUILD: build version -> $PKG_VSN."
echo "DOCKER BUILD: build from -> $EMQX_BUILDER."
echo "DOCKER BUILD: runner from -> $EMQX_RUNNER_IMAGE."
docker build --no-cache --pull \
--build-arg BUILD_FROM="${EMQX_BUILDER}" \
--build-arg RUN_FROM="{EMQX_RUNNER_IMAGE}" \
--build-arg RUN_FROM="${EMQX_RUNNER_IMAGE}" \
--build-arg EMQX_NAME="$PROFILE" \
--tag "emqx/$PROFILE:$PKG_VSN" \
-f deploy/docker/Dockerfile .