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

[release-11.0.11] Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [security] (#100858)

Browse Source 
Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [security] (#100791)

* Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [sec-fixes]

* Chore: Regenerate .drone.yml

---------

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
(cherry picked from commit 27837ee937)

Co-authored-by: Robert Goltz <github@rgoltz.de>
This commit is contained in:
Matheus Macabu
2025-02-18 11:21:33 +02:00
committed by GitHub
co-authored by Robert Goltz
parent b455407364
commit aea05bd1bb
2 changed files with 35 additions and 35 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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.6 --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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 --tag-format='{{ --go-version=1.22.11 --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.6 --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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 image: alpine:3.20.6
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.5 ALPINE_BASE: alpine:3.20.6
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.5 ALPINE_BASE: alpine:3.20.6
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3599,7 +3599,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.5 ALPINE_BASE: alpine:3.20.6
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3701,7 +3701,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.5 image: alpine:3.20.6
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
@@ -3756,7 +3756,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.5 image: alpine:3.20.6
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
@@ -3838,7 +3838,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.5 ALPINE_BASE: alpine:3.20.6
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -3982,7 +3982,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.5 ALPINE_BASE: alpine:3.20.6
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -4108,7 +4108,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.5 ALPINE_BASE: alpine:3.20.6
CDN_DESTINATION: CDN_DESTINATION:
from_secret: rgm_cdn_destination from_secret: rgm_cdn_destination
DESTINATION: DESTINATION:
@@ -4258,7 +4258,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.20.5 image: alpine:3.20.6
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
@@ -4705,7 +4705,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.5 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.6
- 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
@@ -4744,7 +4744,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.5 - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.6
- 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
@@ -5010,6 +5010,6 @@ kind: secret
name: gcr_credentials name: gcr_credentials
--- ---
kind: signature kind: signature
hmac: ff15ac61c0fe96e1b35202075ebc9e9c43ed9d776187cd2aac9a4f25a34a2570 hmac: 2620e62a448514de42bb0187b9ef53292a534e14460fafd939ad65b8bf353e0a
... ...
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.5", "alpine": "alpine:3.20.6",
"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",