[flashrom-gerrit] [S] Change in flashrom[master]: manibuilder/alpine: Disable https for Alpine 3.7 and 3.8

[Felix Singer (Code Review)]

Felix Singer has submitted this change. ( https://review.coreboot.org/c/flashrom/+/67186 )

Change subject: manibuilder/alpine: Disable https for Alpine 3.7 and 3.8
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67186
Tested-by: build bot (Jenkins) 
Reviewed-by: Angel Pons 
Reviewed-by: Felix Singer 
---
M util/manibuilder/Dockerfile.alpine
M util/manibuilder/Makefile
2 files changed, 24 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/util/manibuilder/Dockerfile.alpine b/util/manibuilder/Dockerfile.alpine
index 91b8806..674b545 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 5b58b05..98ed30c 100644
--- a/util/manibuilder/Makefile
+++ b/util/manibuilder/Makefile
@@ -21,12 +21,15 @@
 .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/$*