diff --git a/.drone.yml b/.drone.yml index ee4da34f17f..897b0704368 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 @@ -293,14 +293,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 @@ -377,14 +377,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" @@ -418,7 +418,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.6 + image: golang:1.20.8 name: lint-backend trigger: event: @@ -461,7 +461,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 @@ -474,7 +474,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 @@ -861,11 +861,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 @@ -967,7 +967,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 @@ -1028,7 +1028,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 @@ -1070,7 +1070,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 @@ -1129,7 +1129,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 @@ -1189,7 +1189,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 @@ -1240,14 +1240,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 @@ -1317,14 +1317,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 @@ -1338,7 +1338,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.20.6 + image: golang:1.20.8 name: lint-backend - commands: - ./bin/build verify-drone @@ -1379,7 +1379,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 @@ -1392,7 +1392,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 @@ -1835,11 +1835,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 @@ -2119,7 +2119,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 @@ -2132,7 +2132,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 @@ -2228,7 +2228,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} @@ -2297,7 +2297,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 @@ -2362,7 +2362,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 @@ -2450,13 +2450,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: @@ -2491,7 +2491,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 @@ -2551,14 +2551,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 @@ -2903,7 +2903,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 @@ -2936,7 +2936,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} @@ -3182,7 +3182,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 @@ -3236,14 +3236,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 @@ -3333,7 +3333,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 @@ -3504,7 +3504,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 @@ -3642,7 +3642,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 @@ -3928,9 +3928,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 @@ -3955,9 +3955,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 @@ -4009,7 +4009,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 @@ -4224,6 +4224,6 @@ kind: secret name: gcr_credentials --- kind: signature -hmac: 2da64839224ed2376f040f6a21b071c8a894e568da43a9349f4013863fba14a0 +hmac: 25f3043d85f5787a701e913386176fcabb564373dd5236b47788546ba2c29ae9 ... diff --git a/Dockerfile b/Dockerfile index a018d5f4d95..d2a8abea778 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index 10e60888c2f..29d78a11c82 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -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" diff --git a/pkg/build/docker/build.go b/pkg/build/docker/build.go index 80c50697541..64016257b2a 100644 --- a/pkg/build/docker/build.go +++ b/pkg/build/docker/build.go @@ -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 = "" diff --git a/scripts/drone/utils/images.star b/scripts/drone/utils/images.star index 7b73849d7d2..73f12bd0b9a 100644 --- a/scripts/drone/utils/images.star +++ b/scripts/drone/utils/images.star @@ -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",