Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Upgrade to Go 1.15.1 #27326

Merged
merged 2 commits into from
Sep 2, 2020
Merged

Chore: Upgrade to Go 1.15.1 #27326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40bd96b
Chore: Upgrade to Go 1.15.1
aknuds1 Sep 2, 2020
eaa3270
Upgrade go.mod
aknuds1 Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build

FROM golang:1.14.7-alpine3.12 as go-builder
FROM golang:1.15.1-alpine3.12 as go-builder

RUN apk add --no-cache gcc g++

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build

FROM golang:1.14.7 AS go-builder
FROM golang:1.15.1 AS go-builder

WORKDIR /src/grafana

Expand Down
2 changes: 1 addition & 1 deletion devenv/docker/blocks/prometheus_random_data/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile builds an image for a client_golang example.

# Builder image, where we build the example.
FROM golang:1.14.1 AS builder
FROM golang:1.15.1 AS builder
# Download prometheus/client_golang/examples/random first
RUN go get github.com/prometheus/client_golang/examples/random
WORKDIR /go/src/github.com/prometheus/client_golang
Expand Down
2 changes: 1 addition & 1 deletion packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
source "./deploy-common.sh"

# Install Go
filename="go1.14.linux-amd64.tar.gz"
filename="go1.15.1.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "08df79b46b0adf498ea9f320a0f23d6ec59e9003660b4c9c1ce8e5e2c6f823ca"
untar_file "/tmp/$filename"

Expand Down
2 changes: 1 addition & 1 deletion scripts/build/ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ RUN mv golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64/golangci-lint /tmp/
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20200803

ENV GOVERSION=1.14.7 \
ENV GOVERSION=1.15.1 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=12.18.3-1nodesource1 \
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/ci-deploy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/go:1.14
FROM cimg/go:1.15.1

RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly
RUN cd $GOPATH/src/github.com/aptly-dev/aptly && \
Expand Down