Faster K3s Binary Build Option (#7805)

* Add local build option

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola 2023-06-27 10:28:23 -07:00 committed by GitHub
parent 2215870d5d
commit 70691a95ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 86 additions and 7 deletions

View File

@ -5,3 +5,4 @@
./.cache
./.dapper
./.trash-cache
./.git/objects/pack

70
Dockerfile.local Normal file
View File

@ -0,0 +1,70 @@
ARG GOLANG=golang:1.20.4-alpine3.18
FROM ${GOLANG} as infra
ARG http_proxy=$http_proxy
ARG https_proxy=$https_proxy
ARG no_proxy=$no_proxy
ENV http_proxy=$http_proxy
ENV https_proxy=$https_proxy
ENV no_proxy=$no_proxy
RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \
zlib-dev tar zip squashfs-tools npm coreutils python3 py3-pip openssl-dev libffi-dev libseccomp libseccomp-dev \
libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \
zstd pigz alpine-sdk binutils-gold btrfs-progs-dev btrfs-progs-static gawk yq \
&& \
if [ "$(go env GOARCH)" = "amd64" ]; then \
apk -U --no-cache add mingw-w64-gcc; \
fi
RUN python3 -m pip install awscli
# this works for both go 1.17 and 1.18
RUN GOPROXY=direct go install golang.org/x/tools/cmd/goimports@gopls/v0.11.0
RUN rm -rf /go/src /go/pkg
RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
curl -sL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2; \
fi
ARG SELINUX=true
ENV SELINUX $SELINUX
ENV STATIC_BUILD true
ENV SRC_DIR=/go/src/github.com/k3s-io/k3s
WORKDIR ${SRC_DIR}/
FROM infra as build
ARG SKIP_VALIDATE
COPY ./scripts/ ./scripts
COPY ./go.mod ./go.sum ./main.go ./
COPY ./manifests ./manifests
RUN mkdir -p bin dist
RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
./scripts/download
COPY ./cmd ./cmd
COPY ./pkg ./pkg
COPY ./tests ./tests
COPY ./.git ./.git
RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
--mount=type=cache,id=gobuild,target=/root/.cache/go-build \
./scripts/build
COPY ./contrib ./contrib
RUN --mount=type=cache,id=gomod,target=/go/pkg/mod \
--mount=type=cache,id=gobuild,target=/root/.cache/go-build \
./scripts/package-cli
RUN ./scripts/binary_size_check.sh
FROM scratch as result
ENV SRC_DIR=/go/src/github.com/k3s-io/k3s
COPY --from=build ${SRC_DIR}/dist /dist
COPY --from=build ${SRC_DIR}/bin /bin
COPY --from=build ${SRC_DIR}/build/out /build/out
COPY --from=build ${SRC_DIR}/build/static /build/static
COPY --from=build ${SRC_DIR}/pkg/static /pkg/static
COPY --from=build ${SRC_DIR}/pkg/deploy /pkg/deploy

View File

@ -36,4 +36,10 @@ image-scan:
format:
gofmt -s -l -w $(GO_FILES)
goimports -w $(GO_FILES)
goimports -w $(GO_FILES)
.PHONY: local
local:
DOCKER_BUILDKIT=1 docker build \
--build-arg="REPO TAG GITHUB_TOKEN GOLANG GOCOVER DEBUG" \
-t k3s-local -f Dockerfile.local --output=. .

View File

@ -2,12 +2,13 @@
set -e
GO=${GO-go}
ARCH=${ARCH:-$("${GO}" env GOARCH)}
if [ "${DEBUG}" = 1 ]; then
set -x
fi
. ./scripts/version.sh
# Try to keep the K3s binary under 70 megabytes.
# "64M ought to be enough for anybody"
MAX_BINARY_MB=70

View File

@ -1,6 +1,11 @@
#!/bin/bash
set -e
if [ -n "$SKIP_VALIDATE" ]; then
echo Skipping validation
exit
fi
cd $(dirname $0)/..
echo Running: go mod tidy
@ -9,10 +14,6 @@ go mod tidy
echo Running: go generate
go generate
if [ -n "$SKIP_VALIDATE" ]; then
echo Skipping validation
exit
fi
echo Running validation
. ./scripts/version.sh