Refactor starlark to remove references to the build_image (#74624)
* Refactor starlark to remove references to the build_image
This commit is contained in:
@@ -2,23 +2,34 @@
|
||||
This module contains all the docker images that are used to build test and publish Grafana.
|
||||
"""
|
||||
|
||||
load(
|
||||
"scripts/drone/variables.star",
|
||||
"golang_version",
|
||||
"nodejs_version",
|
||||
)
|
||||
|
||||
images = {
|
||||
"cloudsdk_image": "google/cloud-sdk:431.0.0",
|
||||
"build_image": "grafana/build-container:1.7.5",
|
||||
"publish_image": "grafana/grafana-ci-deploy:1.3.3",
|
||||
"alpine_image": "alpine:3.17.1",
|
||||
"curl_image": "byrnedo/alpine-curl:0.1.8",
|
||||
"go_image": "golang:1.20.6",
|
||||
"plugins_slack_image": "plugins/slack",
|
||||
"postgres_alpine_image": "postgres:12.3-alpine",
|
||||
"mysql5_image": "mysql:5.7.39",
|
||||
"mysql8_image": "mysql:8.0.32",
|
||||
"redis_alpine_image": "redis:6.2.11-alpine",
|
||||
"memcached_alpine_image": "memcached:1.6.9-alpine",
|
||||
"package_publish_image": "us.gcr.io/kubernetes-dev/package-publish:latest",
|
||||
"openldap_image": "osixia/openldap:1.4.0",
|
||||
"drone_downstream_image": "grafana/drone-downstream",
|
||||
"docker_puppeteer_image": "grafana/docker-puppeteer:1.1.0",
|
||||
"docs_image": "grafana/docs-base:dbd975af06",
|
||||
"cypress_image": "cypress/included:12.15.0",
|
||||
"git": "alpine/git:2.40.1",
|
||||
"go": "golang:{}-alpine".format(golang_version),
|
||||
"node": "node:{}-alpine".format(nodejs_version),
|
||||
"cloudsdk": "google/cloud-sdk:431.0.0",
|
||||
"publish": "grafana/grafana-ci-deploy:1.3.3",
|
||||
"alpine": "alpine:3.17.1",
|
||||
"ubuntu": "ubuntu:22.10",
|
||||
"curl": "byrnedo/alpine-curl:0.1.8",
|
||||
"plugins_slack": "plugins/slack",
|
||||
"python": "python:3.8",
|
||||
"postgres_alpine": "postgres:12.3-alpine",
|
||||
"mysql5": "mysql:5.7.39",
|
||||
"mysql8": "mysql:8.0.32",
|
||||
"redis_alpine": "redis:6.2.11-alpine",
|
||||
"memcached_alpine": "memcached:1.6.9-alpine",
|
||||
"package_publish": "us.gcr.io/kubernetes-dev/package-publish:latest",
|
||||
"openldap": "osixia/openldap:1.4.0",
|
||||
"drone_downstream": "grafana/drone-downstream",
|
||||
"docker_puppeteer": "grafana/docker-puppeteer:1.1.0",
|
||||
"docs": "grafana/docs-base:dbd975af06",
|
||||
"cypress": "cypress/included:12.15.0",
|
||||
"dockerize": "jwilder/dockerize:0.6.1",
|
||||
"shellcheck": "koalaman/shellcheck:stable",
|
||||
}
|
||||
|
||||
@@ -4,9 +4,14 @@ All the windows images needed to be in a different file than the other images, s
|
||||
by trivy. Related issue: https://github.com/aquasecurity/trivy/issues/1392
|
||||
"""
|
||||
|
||||
load(
|
||||
"scripts/drone/variables.star",
|
||||
"golang_version",
|
||||
)
|
||||
|
||||
windows_images = {
|
||||
"1809_image": "mcr.microsoft.com/windows:1809",
|
||||
"wix_image": "grafana/ci-wix:0.1.1",
|
||||
"windows_server_core_image": "docker:windowsservercore-1809",
|
||||
"windows_go_image": "grafana/grafana-ci-windows-test:0.1.0",
|
||||
"1809": "mcr.microsoft.com/windows:1809",
|
||||
"wix": "grafana/ci-wix:0.1.1",
|
||||
"windows_server_core": "docker:windowsservercore-1809",
|
||||
"go": "golang:{}-windowsservercore-1809".format(golang_version),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user