Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix debug image builds by installing build-base to enable GCC #3400

Merged
merged 2 commits into from
Nov 19, 2021
Merged

Fix debug image builds by installing build-base to enable GCC #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fb431d
Go back to golang:1.17-alpine
yurishkuro Nov 19, 2021
a6aa332
Add build-base to Docker image
yurishkuro Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/debug/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 0 additions & 2 deletions scripts/build-all-in-one-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down