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

Dockerfile: Bump Go and Alpine versions (#42063)

Browse Source 
Co-authored-by: Dave Henderson <dhenderson@gmail.com>
This commit is contained in:
Dimitris Sotirakis
2021-11-22 14:53:48 +01:00
committed by GitHub
co-authored by Dave Henderson
parent 8608a1f9c3
commit 80945956aa
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+14 -14
View File
@@ -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
...
Dockerfile
+2 -2
View File
@@ -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 <hello@grafana.com>"
Dockerfile.ubuntu
+1 -1
View File
@@ -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
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM alpine:3.14.2
FROM alpine:3.14.3
USER root
packaging/docker/Dockerfile
+1 -1
View File
@@ -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"
packaging/docker/build.sh
+1 -1
View File
@@ -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"
scripts/drone/steps/lib.star
+1 -1
View File
@@ -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'