IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Dockerfile: Bump Go and Alpine versions (#41922)

Browse Source 
* Dockerifle: Bump Go and Alpine versions

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

* Updating .drone.yml with 'make drone'

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
This commit is contained in:
Dave Henderson 2021-11-19 12:59:24 -05:00 committed by GitHub
parent f661e20dd7
commit fc7277920c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.drone.yml
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: 0a8b2ffa75c246644f97bba658e79a6685ed74964a9eee43a30a70ef06b93d9c
hmac: 680fc6fbb881c5e05c62395a4583652197c108835adb25081522b85de926f739
...

4
Dockerfile
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>"

2
Dockerfile.ubuntu
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

2
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.14.2
FROM alpine:3.14.3
USER root

2
packaging/docker/Dockerfile
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"

2
packaging/docker/build.sh
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"

2
scripts/drone/steps/lib.star
View File

@ -5,7 +5,7 @@ build_image = 'grafana/build-container:1.4.6'
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'