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

Chore: Upgrade go and alpine (#43801) (#43846)

Browse Source 
* Upgrade go and alpine

* Bump grabpl version

* Bump alpine version

* Fix version of grabpl

* Bump alpine version

* Bump alpine in Dockerfiles

(cherry picked from commit 3ca58c0e0c)
This commit is contained in:
idafurjes
2022-01-10 11:30:07 +01:00
committed by GitHub
parent 51f516e16d
commit 433f0570cf
6 changed files with 231 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+221 -221
View File
File diff suppressed because it is too large Load Diff
Dockerfile
+3 -3
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 ENV NODE_OPTIONS=--max_old_space_size=8000
@@ -20,7 +20,7 @@ COPY emails emails
ENV NODE_ENV production ENV NODE_ENV production
RUN yarn build 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 RUN apk add --no-cache gcc g++ make
@@ -39,7 +39,7 @@ RUN go mod verify
RUN make build-go RUN make build-go
# Final stage # Final stage
FROM alpine:3.14.3 FROM alpine:3.15
LABEL maintainer="Grafana team <hello@grafana.com>" LABEL maintainer="Grafana team <hello@grafana.com>"
Dockerfile.ubuntu
+2 -2
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 ENV NODE_OPTIONS=--max_old_space_size=8000
@@ -21,7 +21,7 @@ COPY emails emails
ENV NODE_ENV production ENV NODE_ENV production
RUN yarn build RUN yarn build
FROM golang:1.17.3 AS go-builder FROM golang:1.17.6 AS go-builder
WORKDIR /src/grafana WORKDIR /src/grafana
packaging/docker/Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=alpine:3.14.3 ARG BASE_IMAGE=alpine:3.15
FROM ${BASE_IMAGE} FROM ${BASE_IMAGE}
ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz" 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 if [ $UBUNTU_BASE = "0" ]; then
libc="-musl" libc="-musl"
dockerfile="Dockerfile" dockerfile="Dockerfile"
base_image="${base_arch}alpine:3.14.3" base_image="${base_arch}alpine:3.15"
else else
libc="" libc=""
dockerfile="ubuntu.Dockerfile" dockerfile="ubuntu.Dockerfile"
scripts/drone/steps/lib.star
+3 -3
View File
@@ -1,11 +1,11 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = '2.7.8' grabpl_version = '2.7.9'
build_image = 'grafana/build-container:1.4.8' build_image = 'grafana/build-container:1.4.9'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image' 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' curl_image = 'byrnedo/alpine-curl:0.1.8'
windows_image = 'mcr.microsoft.com/windows:1809' windows_image = 'mcr.microsoft.com/windows:1809'
wix_image = 'grafana/ci-wix:0.1.1' wix_image = 'grafana/ci-wix:0.1.1'