IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Update ubuntu image to 22.04 (#70719)

Browse Source
This commit is contained in:
Orgad Shaneh 2023-09-28 16:48:41 +03:00 committed by GitHub
parent 5fae64ccbe
commit b0b2158dea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -237,7 +237,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
--build-arg WIRE_TAGS=$(WIRE_TAGS) \ --build-arg WIRE_TAGS=$(WIRE_TAGS) \
--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \ --build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref 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 \ --build-arg GO_IMAGE=golang:1.20.8 \
--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \ --tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
$(DOCKER_BUILD_ARGS) $(DOCKER_BUILD_ARGS)

2
packaging/docker/build.sh
View File

@ -62,7 +62,7 @@ docker_build () {
base_image="${base_arch}alpine:3.18.3" base_image="${base_arch}alpine:3.18.3"
else else
libc="" libc=""
base_image="${base_arch}ubuntu:20.04" base_image="${base_arch}ubuntu:22.04"
fi fi
grafana_tgz=${GRAFANA_TGZ:-"grafana-latest.linux-${arch}${libc}.tar.gz"} grafana_tgz=${GRAFANA_TGZ:-"grafana-latest.linux-${arch}${libc}.tar.gz"}

2
pkg/build/docker/build.go
View File

@ -74,7 +74,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
tagSuffix := "" tagSuffix := ""
if useUbuntu { if useUbuntu {
libc = "" libc = ""
baseImage = fmt.Sprintf("%subuntu:20.04", baseArch) baseImage = fmt.Sprintf("%subuntu:22.04", baseArch)
tagSuffix = "-ubuntu" tagSuffix = "-ubuntu"
} }

2
scripts/verify-repo-update/Dockerfile.deb
View File

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM ubuntu:22.04
ARG REPO_CONFIG=grafana.list.oss ARG REPO_CONFIG=grafana.list.oss
ARG PACKAGE=grafana ARG PACKAGE=grafana