Update golang and loki-build-image image versions. (#4481)

Signed-off-by: Callum Styan <callumstyan@gmail.com>
grafana · Oct 15, 2021 · 096cf0c · 096cf0c
1 parent 7832783
commit 096cf0c
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/clients/cmd/docker-driver/Dockerfile b/clients/cmd/docker-driver/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.12.0
+ARG BUILD_IMAGE=grafana/loki-build-image:0.18.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile .

diff --git a/clients/cmd/fluent-bit/Dockerfile b/clients/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 COPY . /src/loki
 WORKDIR /src/loki
 RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin

diff --git a/clients/cmd/promtail/Dockerfile b/clients/cmd/promtail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2-buster as build
+FROM golang:1.17.2-buster as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/clients/cmd/promtail/Dockerfile.arm32 b/clients/cmd/promtail/Dockerfile.arm32
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/clients/cmd/promtail/Dockerfile.cross b/clients/cmd/promtail/Dockerfile.cross
@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.12.0
+ARG BUILD_IMAGE=grafana/loki-build-image:0.18.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile .
-FROM golang:1.16.2-alpine as goenv
+FROM golang:1.17.2-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 

diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/loki

diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/cmd/loki-canary/Dockerfile.cross b/cmd/loki-canary/Dockerfile.cross
@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.12.0
+ARG BUILD_IMAGE=grafana/loki-build-image:0.18.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f cmd/promtail/Dockerfile .
-FROM golang:1.16.2-alpine as goenv
+FROM golang:1.17.2-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 

diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross
@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.12.0
+ARG BUILD_IMAGE=grafana/loki-build-image:0.18.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile .
-FROM golang:1.16.2-alpine as goenv
+FROM golang:1.17.2-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 

diff --git a/cmd/migrate/Dockerfile b/cmd/migrate/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 COPY . /src/loki
 WORKDIR /src/loki
 RUN make clean && make BUILD_IN_CONTAINER=false migrate

diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.2 as build
+FROM golang:1.17.2 as build
 
 ARG TOUCH_PROTOS
 COPY . /src/loki

diff --git a/cmd/querytee/Dockerfile.cross b/cmd/querytee/Dockerfile.cross
@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.9.1
+ARG BUILD_IMAGE=grafana/loki-build-image:0.18.0
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f cmd/promtail/Dockerfile .
-FROM golang:1.16.2-alpine as goenv
+FROM golang:1.17.2-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 

diff --git a/tools/dev/loki-boltdb-storage-s3/dev.dockerfile b/tools/dev/loki-boltdb-storage-s3/dev.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16
+FROM golang:1.17
 ENV CGO_ENABLED=0
 RUN go get github.com/go-delve/delve/cmd/dlv