Skip to content

fix(go/base): set GOTOOLCHAIN=local and skip building arm using the base Dockerfile #524

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
dliappis merged 15 commits into from
Mar 4, 2025
Merged

fix(go/base): set GOTOOLCHAIN=local and skip building arm using the base Dockerfile #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5663481
fix(go/base): set GOTOOLCHAIN=local
andrewkroh Feb 26, 2025
f06635b
Don't build arm64 images on amd64 workers
dliappis Feb 27, 2025
85cdd7e
Revert "Don't build arm64 images on amd64 workers"
dliappis Feb 28, 2025
d875fca
Don't build arm64 docker images on amd64 workers for Debian 9
dliappis Feb 28, 2025
634c9de
Merge branch 'main' into fix-on-top-of-523
dliappis Feb 28, 2025
7cae477
trigger fpm builds -- to be removed
dliappis Mar 3, 2025
a497c76
Revert "trigger fpm builds -- to be removed"
dliappis Mar 3, 2025
e665ff1
temporarily trigger fpm builds -- to be removed
dliappis Mar 3, 2025
4822107
build arm64 image for fpm
dliappis Mar 3, 2025
817b0f2
attempt to fix debian 11 build failures
dliappis Mar 3, 2025
c6370b7
Revert "attempt to fix debian 11 build failures"
dliappis Mar 3, 2025
76313af
Revert "temporarily trigger fpm builds -- to be removed"
dliappis Mar 3, 2025
12d53c2
Revert "build arm64 image for fpm"
dliappis Mar 3, 2025
ea548d9
trigger fpm build -- to be removed
dliappis Mar 3, 2025
6426ed1
Revert "trigger fpm build -- to be removed"
dliappis Mar 3, 2025
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
2 changes: 1 addition & 1 deletion go/Makefile.debian9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
IMAGES := base main darwin arm armhf npcap
IMAGES := base main darwin armhf npcap
Comment thread
swiatekm marked this conversation as resolved.
ARM_IMAGES := base-arm
DEBIAN_VERSION := 9
TAG_EXTENSION := -debian9
Expand Down
3 changes: 2 additions & 1 deletion go/base-arm/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,12 @@ RUN ldd --version
WORKDIR /

RUN mkdir -p /root/.config/go/telemetry && echo "off 2024-08-23" > /root/.config/go/telemetry/mode
ENV GOTOOLCHAIN local
RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION-arm \
&& go get . \
&& go env \
&& echo "toolcompile=$(go tool compile -V)" \
&& go build -o /crossbuild /entrypoint.go \
&& CGO_ENABLED=0 GOARCH=arm64 go build -o /crossbuild /entrypoint.go \
&& rm -rf /go/* /root/.cache/* /entrypoint.go

COPY sdks/libpcap-1.8.1.tar.gz .
Expand Down
5 changes: 3 additions & 2 deletions go/base-arm/rootfs/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ by mounting the project inside of a container equipped with cross-compilers.
The root of your project's repo should be mounted at the appropriate location
on the GOPATH which is set to /go.

While executing the build command the following variables with be added to the
environment: GOOS, GOARCH, GOARM, PLATFORM_ID, CC, and CXX.
While executing the build command the following variables will be added to the
environment: GOOS, GOARCH, GOARM, GOTOOLCHAIN=local, PLATFORM_ID, CC, and CXX.
`,
RunE: doBuild,
SilenceUsage: true,
Expand Down Expand Up @@ -104,6 +104,7 @@ func buildEnvironment(platform string) (map[string]string, error) {
"GOOS": goos,
"GOARCH": goarch,
"GOARM": goarm,
"GOTOOLCHAIN": "local", // Disable automatic downloads of toolchains for reproducible builds.
"PLATFORM_ID": platformID,
}

Expand Down
3 changes: 2 additions & 1 deletion go/base/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,12 @@ RUN ldd --version

WORKDIR /
RUN mkdir -p /root/.config/go/telemetry && echo "off 2024-08-23" > /root/.config/go/telemetry/mode
ENV GOTOOLCHAIN=local
RUN go mod init github.com/elastic/golang-crossbuild-$GOLANG_VERSION \
&& go get . \
&& go env \
&& echo "toolcompile=$(go tool compile -V)" \
&& CGO_ENABLED=0 go build -o /crossbuild /entrypoint.go \
&& CGO_ENABLED=0 GOARCH=amd64 go build -o /crossbuild /entrypoint.go \
&& rm -rf /go/* /root/.cache/* /entrypoint.go

COPY sdks/libpcap-1.8.1.tar.gz .
Expand Down
5 changes: 3 additions & 2 deletions go/base/rootfs/entrypoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ by mounting the project inside of a container equipped with cross-compilers.
The root of your project's repo should be mounted at the appropriate location
on the GOPATH which is set to /go.

While executing the build command the following variables with be added to the
environment: GOOS, GOARCH, GOARM, PLATFORM_ID, CC, and CXX.
While executing the build command the following variables will be added to the
environment: GOOS, GOARCH, GOARM, GOTOOLCHAIN=local, PLATFORM_ID, CC, and CXX.
`,
RunE: doBuild,
SilenceUsage: true,
Expand Down Expand Up @@ -104,6 +104,7 @@ func buildEnvironment(platform string) (map[string]string, error) {
"GOOS": goos,
"GOARCH": goarch,
"GOARM": goarm,
"GOTOOLCHAIN": "local", // Disable automatic downloads of toolchains for reproducible builds.
"PLATFORM_ID": platformID,
}

Expand Down