Dockerfile: Bump Go and Alpine versions (#42061)
This commit is contained in:
committed by
GitHub
parent
226029b783
commit
3635314d16
+12
-12
@@ -9,7 +9,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -253,7 +253,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -636,7 +636,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -722,7 +722,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -1067,7 +1067,7 @@ clone:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -1546,7 +1546,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -1652,7 +1652,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -1986,7 +1986,7 @@ clone:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -2459,7 +2459,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -2565,7 +2565,7 @@ platform:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -2870,7 +2870,7 @@ clone:
|
||||
|
||||
steps:
|
||||
- name: identify-runner
|
||||
image: alpine:3.14.2
|
||||
image: alpine:3.14.3
|
||||
commands:
|
||||
- echo $DRONE_RUNNER_NAME
|
||||
|
||||
@@ -3430,6 +3430,6 @@ get:
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: eeeaddc047d301b2d0e6a43a611b2f2991f4b1f82a3958dd5351d2b44a62181d
|
||||
hmac: 7f4835a96db0d5b5d634f05cf3a91b502539d78e8615fe4e0b89323502e5ddd0
|
||||
|
||||
...
|
||||
|
||||
+2
-2
@@ -17,7 +17,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++
|
||||
|
||||
@@ -35,7 +35,7 @@ RUN go mod verify
|
||||
RUN go run build.go build
|
||||
|
||||
# Final stage
|
||||
FROM alpine:3.14.2
|
||||
FROM alpine:3.14.3
|
||||
|
||||
LABEL maintainer="Grafana team <hello@grafana.com>"
|
||||
|
||||
|
||||
+1
-1
@@ -17,7 +17,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
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
FROM alpine:3.14.2
|
||||
FROM alpine:3.14.3
|
||||
|
||||
USER root
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -5,7 +5,7 @@ build_image = 'grafana/build-container:1.4.3'
|
||||
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'
|
||||
windows_image = 'mcr.microsoft.com/windows:1809'
|
||||
wix_image = 'grafana/ci-wix:0.1.1'
|
||||
test_release_ver = 'v7.3.0-test'
|
||||
|
||||
Reference in New Issue
Block a user