Skip to content

Commit

Permalink
feat: update to go 1.22.3->1.23.6 and alpine 3.18->3.21
Browse files Browse the repository at this point in the history
  • Loading branch information
aauren committed Feb 14, 2025
1 parent d1982eb commit 5cdc417
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ on:
- prep-v[1-9].*

env:
BUILDTIME_BASE: "golang:1.22.3-alpine3.18"
BUILDTIME_BASE: "golang:1.23.6-alpine3.21"
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
# https://github.com/cloudnativelabs/kube-router/issues/1676
RUNTIME_BASE: "alpine:3.18"
GO_VERSION: "~1.22.3"
RUNTIME_BASE: "alpine:3.21"
GO_VERSION: "~1.23.6"
GO_CACHE: "/home/runner/.cache/go-build"
GO_MOD_CACHE: "/home/runner/go/pkg/mod"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM ${RUNTIME_BASE}

RUN apk add --no-cache \
iptables \
ip6tables \
iptables-legacy \
ipset \
iproute2 \
ipvsadm \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
BUILD_IN_DOCKER?=true
DOCKER_BUILD_IMAGE?=golang:1.22.3-alpine3.18
DOCKER_BUILD_IMAGE?=golang:1.23.6-alpine3.21
## These variables are used by the Dockerfile as the bases for building and creating the runtime container
## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
GO_CACHE?=$(shell go env GOCACHE)
GO_MOD_CACHE?=$(shell go env GOMODCACHE)
BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
# https://github.com/cloudnativelabs/kube-router/issues/1676
RUNTIME_BASE?=alpine:3.18
RUNTIME_BASE?=alpine:3.21
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.56.2
DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0
GOBGP_VERSION=v3.29.0
Expand Down

0 comments on commit 5cdc417

Please sign in to comment.