mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: Update ubuntu image to 22.04 (#70719)
This commit is contained in:
parent
5fae64ccbe
commit
b0b2158dea
2
Makefile
2
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)
|
||||
|
@ -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"}
|
||||
|
@ -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"
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM ubuntu:20.04
|
||||
FROM ubuntu:22.04
|
||||
|
||||
ARG REPO_CONFIG=grafana.list.oss
|
||||
ARG PACKAGE=grafana
|
||||
|
Loading…
Reference in New Issue
Block a user