Skip to content

Commit cbdcf31

Browse files
whoooaauren
authored andcommitted
Use alpine linux 3.18 for docker image
The ipset version included in alpine 3.17 doesn't work on newer kernels. Signed-off-by: Erik Larsson <[email protected]>
1 parent 22b4718 commit cbdcf31

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ on:
1515
- prep-v[1-9].*
1616

1717
env:
18-
BUILDTIME_BASE: "golang:1.19.5-alpine3.17"
19-
RUNTIME_BASE: "alpine:3.17"
20-
GO_VERSION: "~1.19.5"
18+
BUILDTIME_BASE: "golang:1.20.5-alpine3.18"
19+
RUNTIME_BASE: "alpine:3.18"
20+
GO_VERSION: "~1.20.5"
2121
GO_CACHE: "/home/runner/.cache/go-build"
2222
GO_MOD_CACHE: "/home/runner/go/pkg/mod"
2323

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.19.5-alpine3.17
20+
DOCKER_BUILD_IMAGE?=golang:1.20.5-alpine3.18
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.17
26+
RUNTIME_BASE?=alpine:3.18
2727
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.50.1
2828
GOBGP_VERSION=v3.11.0
2929
QEMU_IMAGE?=multiarch/qemu-user-static

0 commit comments

Comments
 (0)