IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 07:17:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade go and alpine (#43801)

Browse Source 
* Upgrade go and alpine

* Bump grabpl version

* Bump alpine version

* Fix version of grabpl

* Bump alpine version

* Bump alpine in Dockerfiles
This commit is contained in:
idafurjes 2022-01-07 17:27:22 +01:00 committed by GitHub
parent a08e0581de
commit 3ca58c0e0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 227 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

434
.drone.yml
View File

File diff suppressed because it is too large Load Diff

6
Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:16-alpine3.14 as js-builder
FROM node:16-alpine3.15 as js-builder
ENV NODE_OPTIONS=--max_old_space_size=8000
@ -20,7 +20,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build
FROM golang:1.17.3-alpine3.14 as go-builder
FROM golang:1.17.6-alpine3.15 as go-builder
RUN apk add --no-cache gcc g++ make
@ -39,7 +39,7 @@ RUN go mod verify
RUN make build-go
# Final stage
FROM alpine:3.14.3
FROM alpine:3.15
LABEL maintainer="Grafana team <hello@grafana.com>"

4
Dockerfile.ubuntu
View File

@ -1,4 +1,4 @@
FROM node:16-alpine3.14 as js-builder
FROM node:16-alpine3.15 as js-builder
ENV NODE_OPTIONS=--max_old_space_size=8000
@ -21,7 +21,7 @@ COPY emails emails
ENV NODE_ENV production
RUN yarn build
FROM golang:1.17.3 AS go-builder
FROM golang:1.17.6 AS go-builder
WORKDIR /src/grafana

2
packaging/docker/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.14.3
ARG BASE_IMAGE=alpine:3.15
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.3"
base_image="${base_arch}alpine:3.15"
else
libc=""
dockerfile="ubuntu.Dockerfile"

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

@ -1,11 +1,11 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = '2.7.8'
build_image = 'grafana/build-container:1.4.8'
grabpl_version = '2.7.9'
build_image = 'grafana/build-container:1.4.9'
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.3'
alpine_image = 'alpine:3.15'
curl_image = 'byrnedo/alpine-curl:0.1.8'
windows_image = 'mcr.microsoft.com/windows:1809'
wix_image = 'grafana/ci-wix:0.1.1'