apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[v11.2.x] Chore: Update alpine build docker image (#100074)

Browse Source 
Chore: Update alpine build docker image (#99998)

baldm0mma/ update alpine build image

(cherry picked from commit 46af49f907)
v11.2.x
Jev Forsberg 5 months ago committed by GitHub
parent 1c4f7ec931
commit 324c3dca94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 82
      .drone.yml
  2. 2
      scripts/drone/utils/images.star

82
.drone.yml
Unescape View File

@ -18,7 +18,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@ -69,7 +69,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- go install github.com/bazelbuild/buildtools/buildifier@latest - go install github.com/bazelbuild/buildtools/buildifier@latest
@ -112,7 +112,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -170,7 +170,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -307,7 +307,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -414,7 +414,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -503,7 +503,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@ -625,7 +625,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -722,7 +722,7 @@ steps:
GF_APP_MODE: development GF_APP_MODE: development
GF_SERVER_HTTP_PORT: "3001" GF_SERVER_HTTP_PORT: "3001"
GF_SERVER_ROUTER_LOGGING: "1" GF_SERVER_ROUTER_LOGGING: "1"
image: alpine:3.20.3 image: alpine:3.20.5
name: grafana-server name: grafana-server
- commands: - commands:
- ./bin/build e2e-tests --port 3001 --suite dashboards-suite - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@ -941,7 +941,7 @@ steps:
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
-a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.5 --tag-format='{{
.version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -1108,7 +1108,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -1299,7 +1299,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1679,7 +1679,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1750,7 +1750,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1808,7 +1808,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -1874,7 +1874,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -1954,7 +1954,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@ -2020,7 +2020,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -2094,7 +2094,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -2190,7 +2190,7 @@ steps:
GF_APP_MODE: development GF_APP_MODE: development
GF_SERVER_HTTP_PORT: "3001" GF_SERVER_HTTP_PORT: "3001"
GF_SERVER_ROUTER_LOGGING: "1" GF_SERVER_ROUTER_LOGGING: "1"
image: alpine:3.20.3 image: alpine:3.20.5
name: grafana-server name: grafana-server
- commands: - commands:
- ./bin/build e2e-tests --port 3001 --suite dashboards-suite - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@ -2445,7 +2445,7 @@ steps:
- /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu - /src/grafana-build artifacts -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
-a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7 -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
-a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER -a docker:grafana:linux/arm/v7:ubuntu --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.5 --tag-format='{{
.version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --grafana-dir=$$PWD --ubuntu-tag-format='{{
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
@ -2657,7 +2657,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -2927,7 +2927,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -2983,7 +2983,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -3047,7 +3047,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -3125,7 +3125,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@ -3241,7 +3241,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -3469,7 +3469,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -3601,7 +3601,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -4047,7 +4047,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4122,7 +4122,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4284,7 +4284,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4386,7 +4386,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- yarn install --immutable || yarn install --immutable - yarn install --immutable || yarn install --immutable
@ -4440,7 +4440,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -4521,7 +4521,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4665,7 +4665,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4792,7 +4792,7 @@ steps:
environment: environment:
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
from_secret: dagger_token from_secret: dagger_token
ALPINE_BASE: alpine:3.20.3 ALPINE_BASE: alpine:3.20.5
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@ -4942,7 +4942,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.3 image: alpine:3.20.5
name: identify-runner name: identify-runner
- commands: - commands:
- '# It is required that code generated from Thema/CUE be committed and in sync - '# It is required that code generated from Thema/CUE be committed and in sync
@ -5391,7 +5391,7 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.3 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.5
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM ubuntu:22.04 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM ubuntu:22.04
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
@ -5430,7 +5430,7 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0 - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3 - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.3 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.5
- trivy --exit-code 1 --severity HIGH,CRITICAL ubuntu:22.04 - trivy --exit-code 1 --severity HIGH,CRITICAL ubuntu:22.04
- trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8 - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8
- trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
@ -5695,6 +5695,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: ad2d35082af600bbcedefbc506dd4cd49bb89b48da000c0a840cc57256405f09 hmac: 812a2ddecbf18b9e10cc4953a157c4d613b5bab169f4cfe72431295e3ce68b2e
... ...

2
scripts/drone/utils/images.star
Unescape View File

@ -16,7 +16,7 @@ images = {
"node_deb": "node:{}-bookworm".format(nodejs_version[:2]), "node_deb": "node:{}-bookworm".format(nodejs_version[:2]),
"cloudsdk": "google/cloud-sdk:431.0.0", "cloudsdk": "google/cloud-sdk:431.0.0",
"publish": "grafana/grafana-ci-deploy:1.3.3", "publish": "grafana/grafana-ci-deploy:1.3.3",
"alpine": "alpine:3.20.3", "alpine": "alpine:3.20.5",
"ubuntu": "ubuntu:22.04", "ubuntu": "ubuntu:22.04",
"curl": "byrnedo/alpine-curl:0.1.8", "curl": "byrnedo/alpine-curl:0.1.8",
"plugins_slack": "plugins/slack", "plugins_slack": "plugins/slack",

Write Preview
Loading…
Cancel
Save