public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-11.0.12] Chore: Update base alpine docker image (#101326)

Browse Source 
* Chore: Update base alpine docker image (#101320)

* baldm0mma/ update base image arg

* baldm0mma/ update alpine image

* baldm0mma/ skip failing test

* baldm0mma/ specifiy patch

* baldm0mma/ flaky test?

(cherry picked from commit a7ecb19c31)

* baldm0mma/ revert node update
This commit is contained in:
Jev Forsberg
2025-02-26 08:16:12 -07:00
committed by GitHub
parent 3f9ccc543a
commit 5ce3eed44a
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+34 -34
View File
@@ -18,7 +18,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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.6 image: alpine:3.21.3
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.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -250,7 +250,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -360,7 +360,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -450,7 +450,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -581,7 +581,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@@ -682,7 +682,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.6 image: alpine:3.21.3
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
@@ -870,7 +870,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.6 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --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
@@ -1037,7 +1037,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -1227,7 +1227,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -1608,7 +1608,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -1680,7 +1680,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -1739,7 +1739,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -1808,7 +1808,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -1889,7 +1889,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -1978,7 +1978,7 @@ steps:
path: /github-app path: /github-app
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@@ -2078,7 +2078,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.6 image: alpine:3.21.3
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
@@ -2302,7 +2302,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.6 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.21.3 --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
@@ -2514,7 +2514,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -2783,7 +2783,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@@ -2915,7 +2915,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@@ -3362,7 +3362,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3437,7 +3437,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3554,7 +3554,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3656,7 +3656,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
name: identify-runner name: identify-runner
- commands: - commands:
- apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
@@ -3711,7 +3711,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -3793,7 +3793,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3937,7 +3937,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -4063,7 +4063,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.6 ALPINE_BASE: alpine:3.21.3
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -4213,7 +4213,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.6 image: alpine:3.21.3
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
@@ -4660,7 +4660,7 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
- 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.6 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.21.3
- 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
@@ -4699,7 +4699,7 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine - trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
- 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.6 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.21.3
- 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
@@ -4965,6 +4965,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: 80a8ea1487bf8bef7527b3a92ce496e13e8f321f1b3963cf28babf1eb86d6912 hmac: 7dccf255c2e0cd3c2572e44f942ebffa9b7abdf2bf5bce9c57ffcd309d7cde5e
... ...
Dockerfile
+1 -1
View File
@@ -3,7 +3,7 @@
# to maintain formatting of multiline commands in vscode, add the following to settings.json: # to maintain formatting of multiline commands in vscode, add the following to settings.json:
# "docker.languageserver.formatter.ignoreMultilineInstructions": true # "docker.languageserver.formatter.ignoreMultilineInstructions": true
ARG BASE_IMAGE=alpine:3.19.1 ARG BASE_IMAGE=alpine:3.21
ARG JS_IMAGE=node:20-alpine ARG JS_IMAGE=node:20-alpine
ARG JS_PLATFORM=linux/amd64 ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.22.11-alpine ARG GO_IMAGE=golang:1.22.11-alpine
scripts/drone/utils/images.star
+1 -1
View File
@@ -15,7 +15,7 @@ images = {
"node": "node:{}-alpine".format(nodejs_version), "node": "node:{}-alpine".format(nodejs_version),
"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.6", "alpine": "alpine:3.21.3",
"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",