IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 15:27:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build: upgrade Alpine images (#53743)

Browse Source
This commit is contained in:
malcolmholmes 2022-08-15 17:17:55 +01:00 committed by GitHub
parent 835562bb68
commit a19d82124b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
.drone.yml
View File

@ -13,7 +13,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -58,7 +58,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -143,7 +143,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -253,7 +253,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -539,7 +539,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.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
@ -635,7 +635,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
@ -734,7 +734,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER} - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
@ -828,7 +828,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -910,7 +910,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -1020,7 +1020,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -1474,7 +1474,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.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
@ -1680,7 +1680,7 @@ steps:
name: compile-build-cmd name: compile-build-cmd
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json --build-id - ./bin/grabpl publish packages --edition oss --gcp-key /tmp/gcpkey.json --build-id
@ -1769,7 +1769,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -2079,7 +2079,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -2234,7 +2234,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.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
@ -2389,7 +2389,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -2748,7 +2748,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -2939,7 +2939,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -3740,7 +3740,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -4021,7 +4021,7 @@ services: []
steps: steps:
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- mkdir -p bin - mkdir -p bin
@ -4170,7 +4170,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.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
@ -4308,7 +4308,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -4657,7 +4657,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -4839,7 +4839,7 @@ steps:
name: grabpl name: grabpl
- commands: - commands:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
image: alpine:3.15 image: alpine:3.15.6
name: identify-runner name: identify-runner
- commands: - commands:
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
@ -5171,6 +5171,6 @@ kind: secret
name: gcp_upload_artifacts_key name: gcp_upload_artifacts_key
--- ---
kind: signature kind: signature
hmac: d3f17852dfffd0a3112098c897af0aa9936ea3c157ec4786f4d61c2f36fed0da hmac: ee6ca0d5e6990802f6b69df6616b18f1c4a60dc541326dd4304f9e68f858dda4
... ...

2
Dockerfile
View File

@ -39,7 +39,7 @@ RUN go mod verify
RUN make build-go RUN make build-go
# Final stage # Final stage
FROM alpine:3.15 FROM alpine:3.15.6
LABEL maintainer="Grafana team <hello@grafana.com>" LABEL maintainer="Grafana team <hello@grafana.com>"

2
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.15.0 FROM alpine:3.15.6
USER root USER root

2
scripts/drone/steps/lib.star
View File

@ -4,7 +4,7 @@ grabpl_version = 'v3.0.2'
build_image = 'grafana/build-container:1.5.9' build_image = 'grafana/build-container:1.5.9'
publish_image = 'grafana/grafana-ci-deploy:1.3.3' publish_image = 'grafana/grafana-ci-deploy:1.3.3'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' 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' curl_image = 'byrnedo/alpine-curl:0.1.8'
windows_image = 'mcr.microsoft.com/windows:1809' windows_image = 'mcr.microsoft.com/windows:1809'
wix_image = 'grafana/ci-wix:0.1.1' wix_image = 'grafana/ci-wix:0.1.1'