From 07e17e398b8b5087ccf9dabfcccc722e6bbacd1e Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Fri, 19 Nov 2021 17:06:11 -0500 Subject: [PATCH] Fix debug image builds by installing `build-base` to enable GCC (#3400) * Go back to golang:1.17-alpine Signed-off-by: Yuri Shkuro * Add build-base to Docker image Signed-off-by: Yuri Shkuro --- docker/Makefile | 3 +-- docker/debug/Dockerfile | 2 +- scripts/build-all-in-one-image.sh | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index c829e10144e..beb5e814f97 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,8 +1,7 @@ VERSION := 1.0.0 ROOT_IMAGE ?= alpine:3.14 CERT_IMAGE := $(ROOT_IMAGE) -# TODO: Change back to golang:1.17-alpine once https://github.com/docker-library/golang/issues/383 is resolved. -GOLANG_IMAGE := golang:1.17-alpine3.14 +GOLANG_IMAGE := golang:1.17-alpine BASE_IMAGE := localhost:5000/baseimg_alpine:latest DEBUG_IMAGE := localhost:5000/debugimg_alpine:latest diff --git a/docker/debug/Dockerfile b/docker/debug/Dockerfile index 4cf972b8d42..748f5e5cbc5 100644 --- a/docker/debug/Dockerfile +++ b/docker/debug/Dockerfile @@ -3,7 +3,7 @@ ARG golang_image FROM $golang_image AS build ARG TARGETARCH ENV GOPATH /go -RUN apk add --update --no-cache ca-certificates make git +RUN apk add --update --no-cache ca-certificates make git build-base #Once go-delve adds support for s390x (see PR #2948), remove this entire conditional. #Once go-delve adds support for ppc64le (see PR go-delve/delve#1564), remove this entire conditional. RUN if [[ "$TARGETARCH" == "s390x" || "$TARGETARCH" == "ppc64le" ]] ; then \ diff --git a/scripts/build-all-in-one-image.sh b/scripts/build-all-in-one-image.sh index b82795451d7..c9f85d0b9d1 100755 --- a/scripts/build-all-in-one-image.sh +++ b/scripts/build-all-in-one-image.sh @@ -20,8 +20,6 @@ fi make build-ui -set +e - run_integration_test() { CID=$(docker run -d -p 16686:16686 -p 5778:5778 $1:latest) make all-in-one-integration-test