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

[v10.1.x] Chore: Upgrade Alpine base image to 3.18.3 (#74993)

Browse Source 
Chore: Upgrade Alpine base image to 3.18.3 (#74984)

(cherry picked from commit 85abf2bebd)
This commit is contained in:
Horst Gutmann
2023-09-18 13:14:53 +03:00
committed by GitHub
parent 95ba33fde8
commit 07661d77fe
5 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+56 -56
View File
@@ -17,14 +17,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@@ -67,14 +67,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build verify-starlark .
@@ -116,7 +116,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -219,7 +219,7 @@ steps:
name: clone-enterprise
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- yarn install --immutable
@@ -306,14 +306,14 @@ steps:
name: clone-enterprise
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -392,14 +392,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- is_fork=$(curl "https://$GITHUB_TOKEN@api.github.com/repos/grafana/grafana/pulls/$DRONE_PULL_REQUEST"
@@ -433,12 +433,12 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.6
image: golang:1.20.8
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
failure: ignore
image: golang:1.20.6
image: golang:1.20.8
name: validate-modfile
trigger:
event:
@@ -481,7 +481,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -494,7 +494,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -903,11 +903,11 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1051,7 +1051,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- yarn install --immutable
@@ -1123,7 +1123,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build shellcheck
@@ -1225,7 +1225,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1328,7 +1328,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- yarn install --immutable
@@ -1398,7 +1398,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -1460,7 +1460,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- yarn install --immutable
@@ -1526,14 +1526,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1607,14 +1607,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- make gen-go
@@ -1628,12 +1628,12 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.6
image: golang:1.20.8
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
failure: ignore
image: golang:1.20.6
image: golang:1.20.8
name: validate-modfile
- commands:
- ./bin/build verify-drone
@@ -1676,7 +1676,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -1689,7 +1689,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2159,11 +2159,11 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2489,7 +2489,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -2502,7 +2502,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@@ -2598,7 +2598,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -2667,7 +2667,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- yarn install --immutable
@@ -2732,7 +2732,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@@ -2820,13 +2820,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.20.6
image: golang:1.20.8
name: whats-new-checker
trigger:
event:
@@ -2861,7 +2861,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -2921,14 +2921,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3275,7 +3275,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -3308,7 +3308,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
@@ -3559,7 +3559,7 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- mkdir -p bin
@@ -3613,14 +3613,14 @@ services: []
steps:
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3732,7 +3732,7 @@ steps:
name: grabpl
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3965,7 +3965,7 @@ steps:
name: grabpl
- commands:
- echo $DRONE_RUNNER_NAME
image: alpine:3.17.1
image: alpine:3.18.3
name: identify-runner
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -4145,7 +4145,7 @@ steps:
- commands:
- if [ -z "${BUILD_CONTAINER_VERSION}" ]; then echo Missing BUILD_CONTAINER_VERSION;
false; fi
image: alpine:3.17.1
image: alpine:3.18.3
name: validate-version
- commands:
- printenv GCP_KEY > /tmp/key.json
@@ -4431,9 +4431,9 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/build-container:1.7.5
- 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.17.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.18.3
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.6
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.8
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM postgres:12.3-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mysql:5.7.39
@@ -4458,9 +4458,9 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/build-container:1.7.5
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.17.1
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.18.3
- trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.6
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.8
- trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
- trivy --exit-code 1 --severity HIGH,CRITICAL postgres:12.3-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL mysql:5.7.39
@@ -4512,7 +4512,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.6
image: golang:1.20.8
name: compile-build-cmd
- commands:
- ./bin/build publish grafana-com --edition oss
@@ -4709,6 +4709,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 4c8c617fab70525857216928a8b59fa1c43d4c831b2180fab0dd5885aac32af7
hmac: 9ec562101f20b3ba21963a1cc84ba41aae48cf1765f96fb27e2f9d392bf5bbbd
...
Dockerfile
+3 -3
View File
@@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1
ARG BASE_IMAGE=alpine:3.17
ARG JS_IMAGE=node:18-alpine3.17
ARG BASE_IMAGE=alpine:3.18.3
ARG JS_IMAGE=node:18-alpine3.18
ARG JS_PLATFORM=linux/amd64
ARG GO_IMAGE=golang:1.20.8-alpine3.17
ARG GO_IMAGE=golang:1.20.8-alpine3.18
ARG GO_SRC=go-builder
ARG JS_SRC=js-builder
packaging/docker/build.sh
+1 -1
View File
@@ -59,7 +59,7 @@ docker_build () {
esac
if [ $UBUNTU_BASE = "0" ]; then
libc="-musl"
base_image="${base_arch}alpine:3.17"
base_image="${base_arch}alpine:3.18.3"
else
libc=""
base_image="${base_arch}ubuntu:20.04"
pkg/build/docker/build.go
+1 -1
View File
@@ -70,7 +70,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
}
libc := "-musl"
baseImage := fmt.Sprintf("%salpine:3.17", baseArch)
baseImage := fmt.Sprintf("%salpine:3.18.3", baseArch)
tagSuffix := ""
if useUbuntu {
libc = ""
scripts/drone/utils/images.star
+2 -2
View File
@@ -6,9 +6,9 @@ images = {
"cloudsdk_image": "google/cloud-sdk:431.0.0",
"build_image": "grafana/build-container:1.7.5",
"publish_image": "grafana/grafana-ci-deploy:1.3.3",
"alpine_image": "alpine:3.17.1",
"alpine_image": "alpine:3.18.3",
"curl_image": "byrnedo/alpine-curl:0.1.8",
"go_image": "golang:1.20.6",
"go_image": "golang:1.20.8",
"plugins_slack_image": "plugins/slack",
"postgres_alpine_image": "postgres:12.3-alpine",
"mysql5_image": "mysql:5.7.39",