Skip to content

Commit a7d7ac5

Browse files
committed
feat(alpine): update 3.18 -> 3.19
1 parent 5b56e6c commit a7d7ac5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ env:
1818
# Upgrading to Go 1.21.{0,1,2} seems to in cause some sort of race condition that causes tests to fail sporadically.
1919
# Sometimes they fail in apparent race conditions, other times they end up with nil pointer and SIGSEGV errors. We'll
2020
# either need to try with a future bug fix release or do some in-depth debugging before we upgrade.
21-
BUILDTIME_BASE: "golang:1.21.7-alpine3.18"
22-
RUNTIME_BASE: "alpine:3.18"
21+
BUILDTIME_BASE: "golang:1.21.7-alpine3.19"
22+
RUNTIME_BASE: "alpine:3.19"
2323
GO_VERSION: "~1.21.7"
2424
GO_CACHE: "/home/runner/.cache/go-build"
2525
GO_MOD_CACHE: "/home/runner/go/pkg/mod"

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
1717
MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
1818
UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
1919
BUILD_IN_DOCKER?=true
20-
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.18
20+
DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.19
2121
## These variables are used by the Dockerfile as the bases for building and creating the runtime container
2222
## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
2323
GO_CACHE?=$(shell go env GOCACHE)
2424
GO_MOD_CACHE?=$(shell go env GOMODCACHE)
2525
BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
26-
RUNTIME_BASE?=alpine:3.18
26+
RUNTIME_BASE?=alpine:3.19
2727
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.56.2
2828
DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0
2929
GOBGP_VERSION=v3.23.0

0 commit comments

Comments
 (0)