diff options
| author | Nico Huber <nico.h@gmx.de> | 2022-08-29 23:14:36 +0000 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-09-27 13:52:07 +0000 |
| commit | e9c63e21649396288b4c4cfb22417d1cb7ef4139 (patch) | |
| tree | 9c7cfb09c0914e64be4eb7c547fe1b3ee1f77f7f /util/manibuilder | |
| parent | c582ed5bcd324343652f0f11e0eaf0197155def4 (diff) | |
| download | flashrom-e9c63e21649396288b4c4cfb22417d1cb7ef4139.tar.gz flashrom-e9c63e21649396288b4c4cfb22417d1cb7ef4139.tar.bz2 flashrom-e9c63e21649396288b4c4cfb22417d1cb7ef4139.zip | |
manibuilder/alpine: Disable https for Alpine 3.7 and 3.8
Alpine Linux 3.7 and 3.8 fell behind with their pre-installed cer-
tificates. Plus, there seems to be no way to override certificate
checks when downloading packages. Hence, disable https completely.
Change-Id: I49dc3a2a2d44f948182e7571f6289b74e6fa6eb4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67186
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'util/manibuilder')
| -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/$* |