Use ubuntu 22.04 instead of 22.10 (#160)

grafana · Sep 12, 2023 · 5e36725 · 5e36725
1 parent dc0c53f
commit 5e36725
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/pipelines/package_validate.go b/pipelines/package_validate.go
@@ -228,12 +228,12 @@ func validateTarball(ctx context.Context, d *dagger.Client, pkg *dagger.File, sr
 		archive  = containers.ExtractedArchive(d, pkg, packageName)
 	)
 
-	log.Printf("Validating standalone tarball for v%s%s using ubuntu:22.10 and platform %s\n", taropts.Version, taropts.Suffix, taropts.Distro)
+	log.Printf("Validating standalone tarball for v%s%s using ubuntu:22.04 and platform %s\n", taropts.Version, taropts.Suffix, taropts.Distro)
 
 	// This grafana service runs in the background for the e2e tests
 	service := d.Container(dagger.ContainerOpts{
 		Platform: platform,
-	}).From("ubuntu:22.10").
+	}).From("ubuntu:22.04").
 		WithExec([]string{"apt-get", "update", "-yq"}).
 		WithExec([]string{"apt-get", "install", "-yq", "ca-certificates", "libfontconfig1"}).
 		WithDirectory("/src", archive).

diff --git a/scripts/drone_build_nightly_grafana.sh b/scripts/drone_build_nightly_grafana.sh
@@ -69,7 +69,7 @@ dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
   --repo="grafana-dev" \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} >> assets.txt

diff --git a/scripts/drone_build_v_branch_grafana.sh b/scripts/drone_build_v_branch_grafana.sh
@@ -86,7 +86,7 @@ dagger run --silent go run ./cmd windows-installer \
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > docker.txt

diff --git a/scripts/drone_publish_tag_all.sh b/scripts/drone_publish_tag_all.sh
@@ -98,7 +98,7 @@ dagger run --silent go run ./cmd windows-installer \
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > docker.txt &

diff --git a/scripts/drone_publish_tag_enterprise.sh b/scripts/drone_publish_tag_enterprise.sh
@@ -73,7 +73,7 @@ dagger run --silent go run ./cmd windows-installer \
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > docker.txt

diff --git a/scripts/drone_publish_tag_grafana.sh b/scripts/drone_publish_tag_grafana.sh
@@ -84,7 +84,7 @@ dagger run --silent go run ./cmd windows-installer \
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > docker.txt

diff --git a/scripts/drone_publish_tag_pro.sh b/scripts/drone_publish_tag_pro.sh
@@ -53,7 +53,7 @@ dagger run --silent go run ./cmd deb \
 dagger run --silent go run ./cmd docker \
   $(cat assets.txt | grep tar.gz | grep -v docker | grep -v sha256 | grep -v windows | grep -v darwin | grep -v arm-6 | awk '{print "--package=" $0}') \
   --checksum \
-  --ubuntu-base="ubuntu:22.10" \
+  --ubuntu-base="ubuntu:22.04" \
   --alpine-base="alpine:3.18.0" \
   --destination=${local_dst} \
   --gcp-service-account-key-base64=${GCP_KEY_BASE64} > docker.txt &