diff --git a/.drone.yml b/.drone.yml index 6479b6b80bf..7216ad02128 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -54,7 +54,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -137,7 +137,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -244,7 +244,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -526,7 +526,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -620,7 +620,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} @@ -717,7 +717,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} @@ -803,7 +803,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -878,7 +878,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -980,7 +980,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -1423,7 +1423,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1614,7 +1614,7 @@ steps: name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - ./bin/grabpl store-packages --edition oss --gcp-key /tmp/gcpkey.json --build-id @@ -1689,7 +1689,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -1994,7 +1994,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -2146,7 +2146,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2299,7 +2299,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -2655,7 +2655,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -2846,7 +2846,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3606,7 +3606,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -3882,7 +3882,7 @@ services: [] steps: - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - mkdir -p bin @@ -4028,7 +4028,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4164,7 +4164,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -4510,7 +4510,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -4692,7 +4692,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.15 + image: alpine:3.15.6 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -5016,6 +5016,6 @@ kind: secret name: gcp_upload_artifacts_key --- kind: signature -hmac: 6c15022f04f81874bc7af3ed1047af60e952b98f1185e49bf143b12599003260 +hmac: 710e3af4e83d49bce6403c31135075bbd2fbc302b985e0dea201157950805924 ... diff --git a/Dockerfile b/Dockerfile index 9454e6dfed5..ccef713e318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN go mod verify RUN make build-go # Final stage -FROM alpine:3.15 +FROM alpine:3.15.6 LABEL maintainer="Grafana team " diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile index 7365693e61f..3907fe9c05a 100644 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15.0 +FROM alpine:3.15.6 USER root diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index ce995499cfc..7bfa9256730 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -4,7 +4,7 @@ grabpl_version = 'v2.9.54-v9.1.x' build_image = 'grafana/build-container:1.5.9' 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' +alpine_image = 'alpine:3.15.6' curl_image = 'byrnedo/alpine-curl:0.1.8' windows_image = 'mcr.microsoft.com/windows:1809' wix_image = 'grafana/ci-wix:0.1.1'