Skip to content

Commit

Permalink
Use alpine linux 3.18 for docker image
Browse files Browse the repository at this point in the history
The ipset version included in alpine 3.17 doesn't work on newer kernels.

Signed-off-by: Erik Larsson <[email protected]>
  • Loading branch information
whooo authored and aauren committed Aug 1, 2023
1 parent 6bdb562 commit 9990f3b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ on:
- prep-v[1-9].*

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

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ 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.19.5-alpine3.17
DOCKER_BUILD_IMAGE?=golang:1.20.5-alpine3.18
## 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)
RUNTIME_BASE?=alpine:3.17
RUNTIME_BASE?=alpine:3.18
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.50.1
GOBGP_VERSION=v3.11.0
QEMU_IMAGE?=multiarch/qemu-user-static
Expand Down

0 comments on commit 9990f3b

Please sign in to comment.