diff options
| -rw-r--r-- | util/manibuilder/Dockerfile.alpine | 2 | ||||
| -rw-r--r-- | util/manibuilder/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine index 91b880659..674b54512 100644 --- a/util/manibuilder/Dockerfile.alpine +++ b/util/manibuilder/Dockerfile.alpine @@ -1,7 +1,9 @@ FROM manibase +ARG PROTO=https RUN \ adduser -D mani mani && \ + sed -i "s/https/${PROTO}/" /etc/apk/repositories && \ apk update && \ apk add ca-certificates build-base linux-headers git ccache \ pciutils-dev libusb-compat-dev libusb-dev diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index 5b58b053b..98ed30c96 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -21,12 +21,15 @@ Dockerfile.$(call ident,$(1)): Dockerfile.$(call stem,$(1)) mani-wrapper.sh .INTERMEDIATE: Dockerfile.$(call ident,$(1)) $(1)-build: Dockerfile.$(call ident,$(1)) - $(QUIET_SETUP)docker build . -f $$< -t mani/$(1) + $(QUIET_SETUP)docker build . -f $$< -t mani/$(1) $$(DOCKER_BUILD_ARGS) endef $(foreach tag,$(MULTIARCH_TAGS), \ $(eval $(call build_template,$(tag),multiarch))) +$(addsuffix -build,$(filter alpine%v3.7 alpine%v3.8,$(MULTIARCH_TAGS))): \ + DOCKER_BUILD_ARGS = --build-arg PROTO=http + djgpp\:6.1.0-build: %-build: Dockerfile.djgpp mani-wrapper.sh $(QUIET_SETUP)docker build . -f $< -t mani/$* |