diff --git a/pipelines/package_validate.go b/pipelines/package_validate.go index e4e2e506..83e91e47 100644 --- 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 index 502d5c6b..bf0beadf 100755 --- 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 index bfa183a0..26109caa 100755 --- 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 index 507ac2c6..90cc8573 100755 --- 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 index d3ed3287..a2b1a32d 100755 --- 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 index 1e5ac8c3..b88ca91d 100755 --- 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 index a35f44dc..9ff6b469 100755 --- 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 &