From 5fb2986aa54b05e515c91dde2c31209af4ef0d6a Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Mon, 6 Mar 2023 11:40:47 +0200 Subject: [PATCH] [v9.4.x] Chore: Bump alpine version to `3.17.1` (#63252) (#63264) Chore: Bump alpine version to `3.17.1` (#63252) Bump alpine version to 3.17.1 (cherry picked from commit 24c60486f62fd723b3d61718d45e7b9382f74656) # Conflicts: # .drone.yml --- .drone.yml | 78 ++++++++++++++++++------------------ scripts/drone/steps/lib.star | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.drone.yml b/.drone.yml index b7621ad9df3..197060a86df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -73,7 +73,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -128,7 +128,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -191,7 +191,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - yarn install --immutable @@ -245,7 +245,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -329,7 +329,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -392,7 +392,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -742,7 +742,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -850,7 +850,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - yarn install --immutable @@ -967,7 +967,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - yarn install --immutable @@ -1034,7 +1034,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -1094,7 +1094,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - yarn install --immutable @@ -1145,7 +1145,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -1222,7 +1222,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -1284,7 +1284,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -1732,7 +1732,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2010,7 +2010,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -2316,7 +2316,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -2373,7 +2373,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2473,7 +2473,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2636,7 +2636,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -2952,7 +2952,7 @@ steps: name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -3043,7 +3043,7 @@ steps: name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -3152,7 +3152,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3384,7 +3384,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3634,7 +3634,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3875,7 +3875,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -3971,7 +3971,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -4050,7 +4050,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -4758,7 +4758,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -5037,7 +5037,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -5091,7 +5091,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5188,7 +5188,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5341,7 +5341,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -5659,7 +5659,7 @@ steps: name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - mkdir -p bin @@ -5746,7 +5746,7 @@ steps: name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -5852,7 +5852,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -6073,7 +6073,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15.6 + image: alpine:3.17.1 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -6553,6 +6553,6 @@ kind: secret name: aws_secret_access_key --- kind: signature -hmac: ca2f0b12a65b59171dc2361a4cfdc5a4f9662e11d8e4a30564f21cab237b6eec +hmac: 016127ae3397569f1355667e7bf7743da586fd9d30cb25bbb2495b466b0d0a60 ... diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index d36a5bb0c69..aabe0f7e2a0 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -12,7 +12,7 @@ grabpl_version = "v3.0.21" build_image = "grafana/build-container:1.7.2" publish_image = "grafana/grafana-ci-deploy:1.3.3" deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" -alpine_image = "alpine:3.15.6" +alpine_image = "alpine:3.17.1" curl_image = "byrnedo/alpine-curl:0.1.8" windows_image = "mcr.microsoft.com/windows:1809" wix_image = "grafana/ci-wix:0.1.1"