Skip to content

Allow for configuration of GORPOXY in docker build #655

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

Merged
merged 1 commit into from
Nov 16, 2022
Merged

Allow for configuration of GORPOXY in docker build #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ COPY go.mod go.sum ./
# uncomment if using vendor
# COPY ./vendor ./vendor

ARG GOPROXY
ENV GOPROXY=${GOPROXY}

RUN go mod download

COPY . ./
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ generate: controller-gen
# Requires buildx to be installed: https://docs.docker.com/buildx/working-with-buildx/
# By default the TARGETPLATFORM is set to linux/amd64, change the value if you are building for linux/arm64
docker-build: check-env test
docker buildx build --platform linux/amd64 -t $(IMAGE) . --load
docker buildx build --platform linux/amd64 --build-arg GOPROXY=$(GOPROXY) -t $(IMAGE) . --load
Copy link
Contributor

@rakeb rakeb Nov 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we only considering linux/amd64?

Copy link
Contributor Author

@BennettJames BennettJames Nov 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The github workflow performs its own builds, including an arm64 image. Perhaps we could be a bit more clever about sharing the build setup and configuration for each, but as this is an existing setup that's not being changed by this patch I'm ok leaving that for now.


docker-push: check-env
docker push $(IMAGE)
Expand Down