diff --git a/Makefile b/Makefile index 7e86aa1e36f..00fc748fd91 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development. --build-arg WIRE_TAGS=$(WIRE_TAGS) \ --build-arg COMMIT_SHA=$$(git rev-parse HEAD) \ --build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \ - --build-arg BASE_IMAGE=ubuntu:20.04 \ + --build-arg BASE_IMAGE=ubuntu:22.04 \ --build-arg GO_IMAGE=golang:1.20.8 \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ $(DOCKER_BUILD_ARGS) diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index 29d78a11c82..5a16049d133 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -62,7 +62,7 @@ docker_build () { base_image="${base_arch}alpine:3.18.3" else libc="" - base_image="${base_arch}ubuntu:20.04" + base_image="${base_arch}ubuntu:22.04" fi grafana_tgz=${GRAFANA_TGZ:-"grafana-latest.linux-${arch}${libc}.tar.gz"} diff --git a/pkg/build/docker/build.go b/pkg/build/docker/build.go index 64016257b2a..29b2263e62b 100644 --- a/pkg/build/docker/build.go +++ b/pkg/build/docker/build.go @@ -74,7 +74,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use tagSuffix := "" if useUbuntu { libc = "" - baseImage = fmt.Sprintf("%subuntu:20.04", baseArch) + baseImage = fmt.Sprintf("%subuntu:22.04", baseArch) tagSuffix = "-ubuntu" } diff --git a/scripts/verify-repo-update/Dockerfile.deb b/scripts/verify-repo-update/Dockerfile.deb index ad651a1bdff..ff67e3f8553 100644 --- a/scripts/verify-repo-update/Dockerfile.deb +++ b/scripts/verify-repo-update/Dockerfile.deb @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ARG REPO_CONFIG=grafana.list.oss ARG PACKAGE=grafana