Merge pull request #20 from alswl/feat/mirror
feat: enable mirror arg when build
This commit is contained in:
commit
94d3682623
3
Makefile
3
Makefile
@ -46,6 +46,8 @@ PATCH_VERSION = 0
|
|||||||
BUILD_VERSION = $(COMMIT)
|
BUILD_VERSION = $(COMMIT)
|
||||||
VERSION ?= v$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)-$(BUILD_VERSION)
|
VERSION ?= v$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)-$(BUILD_VERSION)
|
||||||
|
|
||||||
|
CHINA_MIRROR ?= false
|
||||||
|
|
||||||
# Support gsed on OSX (installed via brew), falling back to sed. On Linux
|
# Support gsed on OSX (installed via brew), falling back to sed. On Linux
|
||||||
# systems gsed won't be installed, so will use sed as expected.
|
# systems gsed won't be installed, so will use sed as expected.
|
||||||
SED ?= $(shell which gsed 2>/dev/null || which sed)
|
SED ?= $(shell which gsed 2>/dev/null || which sed)
|
||||||
@ -68,6 +70,7 @@ images: ## Build docker images
|
|||||||
docker build \
|
docker build \
|
||||||
-t $${image} \
|
-t $${image} \
|
||||||
--build-arg COMMIT=$(COMMIT) \
|
--build-arg COMMIT=$(COMMIT) \
|
||||||
|
--build-arg CHINA_MIRROR=$(CHINA_MIRROR) \
|
||||||
--progress=plain \
|
--progress=plain \
|
||||||
-f ./$${target}/Dockerfile $${target}; \
|
-f ./$${target}/Dockerfile $${target}; \
|
||||||
done; \
|
done; \
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit c74d0415e2e69a1e216088a0d9edd29bf16170bc
|
Subproject commit e3219306d1ef8db6981e4918d73a3c957c025340
|
Loading…
Reference in New Issue
Block a user