From 9a13fbafcab94d2947f1ed60b68d6176b4cd0f7a Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Tue, 18 Feb 2025 10:10:34 +0100 Subject: [PATCH] [release-11.1.12] Chore: Update alpine docker image (minor) - 3.20.5 to 3.20.6 [security] (#100832) 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 (cherry picked from commit 27837ee937217a74ac1d1cc547516fafd344fa5d) Co-authored-by: Robert Goltz --- .drone.yml | 68 ++++++++++++++++----------------- scripts/drone/utils/images.star | 2 +- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6cc52ee7c77..55539e10825 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -69,7 +69,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - go install github.com/bazelbuild/buildtools/buildifier@latest @@ -112,7 +112,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -249,7 +249,7 @@ steps: path: /github-app - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -356,7 +356,7 @@ steps: path: /github-app - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -446,7 +446,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -568,7 +568,7 @@ steps: path: /github-app - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - mkdir -p bin @@ -668,7 +668,7 @@ steps: GF_APP_MODE: development GF_SERVER_HTTP_PORT: "3001" GF_SERVER_ROUTER_LOGGING: "1" - image: alpine:3.20.5 + image: alpine:3.20.6 name: grafana-server - commands: - ./bin/build e2e-tests --port 3001 --suite dashboards-suite @@ -857,7 +857,7 @@ steps: - /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/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 }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -1024,7 +1024,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1214,7 +1214,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -1594,7 +1594,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -1665,7 +1665,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -1723,7 +1723,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -1789,7 +1789,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1870,7 +1870,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -1950,7 +1950,7 @@ steps: path: /github-app - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - mkdir -p bin @@ -2049,7 +2049,7 @@ steps: GF_APP_MODE: development GF_SERVER_HTTP_PORT: "3001" GF_SERVER_ROUTER_LOGGING: "1" - image: alpine:3.20.5 + image: alpine:3.20.6 name: grafana-server - commands: - ./bin/build e2e-tests --port 3001 --suite dashboards-suite @@ -2274,7 +2274,7 @@ steps: - /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/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 }}-ubuntu-{{ .arch }}' > docker.txt - find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i @@ -2486,7 +2486,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2755,7 +2755,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - mkdir -p bin @@ -2887,7 +2887,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - mkdir -p bin @@ -3333,7 +3333,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -3408,7 +3408,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -3570,7 +3570,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -3672,7 +3672,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - yarn install --immutable || yarn install --immutable @@ -3726,7 +3726,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3808,7 +3808,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -3952,7 +3952,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -4079,7 +4079,7 @@ steps: environment: _EXPERIMENTAL_DAGGER_CLOUD_TOKEN: from_secret: dagger_token - ALPINE_BASE: alpine:3.20.5 + ALPINE_BASE: alpine:3.20.6 CDN_DESTINATION: from_secret: rgm_cdn_destination DESTINATION: @@ -4229,7 +4229,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.20.5 + image: alpine:3.20.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4677,7 +4677,7 @@ steps: - 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 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 byrnedo/alpine-curl:0.1.8 - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack @@ -4716,7 +4716,7 @@ steps: - 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 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 byrnedo/alpine-curl:0.1.8 - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack @@ -4981,6 +4981,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 57acf37f8e2e1c53e456e4c5129d4e1ada1994e3c0733179afa3cbd394189b74 +hmac: 03f26a716a554e3f32578f67cfcbc2ac51bff93c751f24d180cc14acf521de6b ... diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index d2bc9880409..58bad1281e4 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -16,7 +16,7 @@ images = { "node_deb": "node:{}-bookworm".format(nodejs_version[:2]), "cloudsdk": "google/cloud-sdk:431.0.0", "publish": "grafana/grafana-ci-deploy:1.3.3", - "alpine": "alpine:3.20.5", + "alpine": "alpine:3.20.6", "ubuntu": "ubuntu:22.04", "curl": "byrnedo/alpine-curl:0.1.8", "plugins_slack": "plugins/slack",