Skip to content

Commit b7a69bb

Browse files
authored
Merge pull request #31 from stacklok/fix-builder-gotoolchain
Set GOTOOLCHAIN=auto for builder container
2 parents 2730fda + 7887025 commit b7a69bb

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

Taskfile.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ tasks:
210210
- >-
211211
{{.CONTAINER_RUNTIME}} run --rm -v $(pwd):/src:z -w /src
212212
-e CGO_ENABLED=1
213+
-e GOTOOLCHAIN=auto
213214
{{.BUILDER_IMAGE}}:{{.BUILDER_IMAGE_TAG}}
214215
go build -buildvcs=false -ldflags "{{.LDFLAGS}}" -o bin/{{.RUNNER_NAME}} ./runner/cmd/propolis-runner
215216
generates:

images/builder/Containerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ RUN git clone --depth 1 --branch "${LIBKRUN_VERSION}" https://github.com/contain
4242
&& sed "s|^libdir=.*|libdir=/opt/libkrun-built|" /opt/libkrun/libkrun.pc > /opt/libkrun-built/pkgconfig/libkrun.pc
4343

4444
# Environment variables for downstream builds
45+
ENV GOTOOLCHAIN=auto
4546
ENV LIBKRUN_LIB_PATH=/opt/libkrun-built
4647
ENV PKG_CONFIG_PATH=/opt/libkrun-built/pkgconfig
4748
ENV CGO_LDFLAGS=-L/opt/libkrun-built

0 commit comments

Comments
 (0)