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

build: parameterise path to Dockerfile

This commit is contained in:
Zaiming Shi 2021-11-16 14:08:58 +01:00
parent addf0de4be
commit 4d9854012e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -7,6 +7,7 @@ export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
export EMQX_DESC ?= EMQ X export EMQX_DESC ?= EMQ X
export EMQX_CE_DASHBOARD_VERSION ?= v4.3.3 export EMQX_CE_DASHBOARD_VERSION ?= v4.3.3
export DOCKERFILE=deploy/docker/Dockerfile
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
export REBAR_COLOR=none export REBAR_COLOR=none
endif endif

2
build
View File

@ -141,7 +141,7 @@ make_docker() {
--build-arg RUN_FROM="${EMQX_RUNNER_IMAGE}" \ --build-arg RUN_FROM="${EMQX_RUNNER_IMAGE}" \
--build-arg EMQX_NAME="$PROFILE" \ --build-arg EMQX_NAME="$PROFILE" \
--tag "emqx/$PROFILE:$PKG_VSN" \ --tag "emqx/$PROFILE:$PKG_VSN" \
-f deploy/docker/Dockerfile . -f "${DOCKERFILE}" .
} }
log "building artifact=$ARTIFACT for profile=$PROFILE" log "building artifact=$ARTIFACT for profile=$PROFILE"