From 80945956aa053a59b402b5b0a952fe4d2756c977 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Mon, 22 Nov 2021 14:53:48 +0100 Subject: [PATCH] Dockerfile: Bump Go and Alpine versions (#42063) Co-authored-by: Dave Henderson --- .drone.yml | 28 +++++++++---------- Dockerfile | 4 +-- Dockerfile.ubuntu | 2 +- .../grafana-plugin-ci-alpine/Dockerfile | 2 +- packaging/docker/Dockerfile | 2 +- packaging/docker/build.sh | 2 +- scripts/drone/steps/lib.star | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5737de35c02..55d899bf8e9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -112,7 +112,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -285,7 +285,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -359,7 +359,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -740,7 +740,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -830,7 +830,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -1196,7 +1196,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -1666,7 +1666,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -1775,7 +1775,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -2130,7 +2130,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -2593,7 +2593,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -2707,7 +2707,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - make gen-go @@ -3034,7 +3034,7 @@ steps: name: grabpl - commands: - echo $DRONE_RUNNER_NAME - image: alpine:3.14.2 + image: alpine:3.14.3 name: identify-runner - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -3556,6 +3556,6 @@ kind: secret name: drone_token --- kind: signature -hmac: 68182383c80b7e49367441fa69d6c7fb21527649213196a0ee44ddbe9a1d7e41 +hmac: 6286505bce5b02c170a374f23a06097f656485a893023fd81ab7456a3419d667 ... diff --git a/Dockerfile b/Dockerfile index 82441d666ed..0ad3e76a693 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.17.0-alpine3.14 as go-builder +FROM golang:1.17.3-alpine3.14 as go-builder RUN apk add --no-cache gcc g++ make @@ -40,7 +40,7 @@ RUN go mod verify RUN make build-go # Final stage -FROM alpine:3.14.2 +FROM alpine:3.14.3 LABEL maintainer="Grafana team " diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index b77ece310c5..90df9cb8e42 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -21,7 +21,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.17.0 AS go-builder +FROM golang:1.17.3 AS go-builder WORKDIR /src/grafana diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile b/packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile index 79aefec081e..e56641813ad 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.14.2 +FROM alpine:3.14.3 USER root diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index b0e529da403..e37e270005d 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=alpine:3.14.2 +ARG BASE_IMAGE=alpine:3.14.3 FROM ${BASE_IMAGE} ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz" diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh index a14a20329f3..991508be47b 100755 --- a/packaging/docker/build.sh +++ b/packaging/docker/build.sh @@ -60,7 +60,7 @@ docker_build () { if [ $UBUNTU_BASE = "0" ]; then libc="-musl" dockerfile="Dockerfile" - base_image="${base_arch}alpine:3.14.2" + base_image="${base_arch}alpine:3.14.3" else libc="" dockerfile="ubuntu.Dockerfile" diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index c2032761934..ad3727ad77f 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -5,7 +5,7 @@ build_image = 'grafana/build-container:1.4.5' publish_image = 'grafana/grafana-ci-deploy:1.3.1' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' -alpine_image = 'alpine:3.14.2' +alpine_image = 'alpine:3.14.3' curl_image = 'byrnedo/alpine-curl:0.1.8' windows_image = 'mcr.microsoft.com/windows:1809' wix_image = 'grafana/ci-wix:0.1.1'