This moves the ubuntu:22.10 image to 22.04 (which is available until… (#74757)

This moves the ubuntu:22.10 image to 22.04 (which is avaailable until april 2027)
This commit is contained in:
Kevin Minehart
2023-09-12 12:59:02 -05:00
committed by GitHub
parent 9ecbe8dd64
commit d2154387d8
4 changed files with 20 additions and 6 deletions

View File

@@ -101,6 +101,7 @@ def rgm_build(script = "drone_publish_main.sh", canFail = True):
rgm_build_step = {
"name": "rgm-build",
"image": "grafana/grafana-build:main",
"pull": "always",
"commands": [
"export GRAFANA_DIR=$$(pwd)",
"cd /src && ./scripts/{}".format(script),

View File

@@ -8,6 +8,7 @@ def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt")
return {
"name": "rgm-package",
"image": "grafana/grafana-build:main",
"pull": "always",
"depends_on": ["yarn-install"],
"commands": [
"/src/grafana-build package --distro={} ".format(distros) +
@@ -25,6 +26,7 @@ def rgm_build_backend_step(distros = "linux/amd64,linux/arm64"):
return {
"name": "rgm-package",
"image": "grafana/grafana-build:main",
"pull": "always",
"commands": [
"/src/grafana-build build --distro={} --grafana-dir=$$PWD".format(distros),
],
@@ -35,7 +37,9 @@ def rgm_build_docker_step(packages, ubuntu, alpine, depends_on = ["rgm-package"]
return {
"name": "rgm-build-docker",
"image": "grafana/grafana-build:main",
"pull": "always",
"commands": [
"docker run --privileged --rm tonistiigi/binfmt --install all",
"/src/grafana-build docker " +
"--package=$(cat {} | grep tar.gz | grep -v docker | grep -v sha256) ".format(packages) +
"--ubuntu-base={} ".format(ubuntu) +

View File

@@ -15,7 +15,7 @@ images = {
"cloudsdk": "google/cloud-sdk:431.0.0",
"publish": "grafana/grafana-ci-deploy:1.3.3",
"alpine": "alpine:3.17.1",
"ubuntu": "ubuntu:22.10",
"ubuntu": "ubuntu:22.04",
"curl": "byrnedo/alpine-curl:0.1.8",
"plugins_slack": "plugins/slack",
"python": "python:3.8",