Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This bumps to Go 1.23; also bump base image to distroless-iptables:v0.6.2
  • Loading branch information
jingyuanliang committed Sep 4, 2024
1 parent ed4cb42 commit 338ea59
Show file tree
Hide file tree
Showing 8 changed files with 464 additions and 683 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ COPY bin/{ARG_OS}_{ARG_ARCH}/{ARG_BIN} /{ARG_BIN}

# This container has to run as root for iptables. Be explicit here.
USER 0:0
ENV HOME /
ENV HOME=/

ENTRYPOINT ["/{ARG_BIN}"]
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ALL_PLATFORMS ?= linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x

# The "FROM" part of the Dockerfile. This should be a manifest-list which
# supports all of the platforms listed in ALL_PLATFORMS.
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.5.4
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.6.2

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
Expand Down Expand Up @@ -60,7 +60,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.22
GO_VERSION := 1.23
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down Expand Up @@ -227,7 +227,7 @@ $(LICENSES): | $(BUILD_DIRS)
--env HTTP_PROXY="$(HTTP_PROXY)" \
--env HTTPS_PROXY="$(HTTPS_PROXY)" \
$(BUILD_IMAGE) \
go install github.com/google/go-licenses
go install github.com/google/go-licenses/v2
# The tool runs in a container because it execs `go`, which doesn't
# play nicely with CI. The tool also wants its output dir to not
# exist, so we can't just volume mount $(LICENSES).
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleCloudPlatform/netd

go 1.22
go 1.23

require (
github.com/containernetworking/plugins v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ COPY --from=stuff / /

# This container has to run as root for iptables. Be explicit here.
USER 0:0
ENV HOME /
ENV HOME=/

ENTRYPOINT ["/{ARG_BIN}"]
4 changes: 2 additions & 2 deletions scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ALL_PLATFORMS ?= linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x

# The "FROM" part of the Dockerfile. This should be a manifest-list which
# supports all of the platforms listed in ALL_PLATFORMS.
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.5.4
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.6.2

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
Expand Down Expand Up @@ -70,7 +70,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.22
GO_VERSION := 1.23
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down
260 changes: 135 additions & 125 deletions tools/go.mod

Large diffs are not rendered by default.

869 changes: 320 additions & 549 deletions tools/go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ package tools
import (
_ "github.com/estesp/manifest-tool/v2/cmd/manifest-tool"
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/google/go-licenses"
_ "github.com/google/go-licenses/v2"
)

0 comments on commit 338ea59

Please sign in to comment.