apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Callum Styan <callumstyan@gmail.com>
pull/4486/head
Callum Styan 4 years ago committed by GitHub
parent 7832783b1c
commit 096cf0cfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 18 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      clients/cmd/docker-driver/Dockerfile
  2. 2
      clients/cmd/fluent-bit/Dockerfile
  3. 2
      clients/cmd/promtail/Dockerfile
  4. 2
      clients/cmd/promtail/Dockerfile.arm32
  5. 4
      clients/cmd/promtail/Dockerfile.cross
  6. 2
      cmd/logcli/Dockerfile
  7. 2
      cmd/loki-canary/Dockerfile
  8. 4
      cmd/loki-canary/Dockerfile.cross
  9. 2
      cmd/loki/Dockerfile
  10. 4
      cmd/loki/Dockerfile.cross
  11. 2
      cmd/migrate/Dockerfile
  12. 2
      cmd/querytee/Dockerfile
  13. 4
      cmd/querytee/Dockerfile.cross
  14. 2
      tools/dev/loki-boltdb-storage-s3/dev.dockerfile

2
clients/cmd/docker-driver/Dockerfile
Unescape View File

@ -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 .

2
clients/cmd/fluent-bit/Dockerfile
Unescape View File

@ -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

2
clients/cmd/promtail/Dockerfile
Unescape View File

@ -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

2
clients/cmd/promtail/Dockerfile.arm32
Unescape View File

@ -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

4
clients/cmd/promtail/Dockerfile.cross
Unescape View File

@ -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

2
cmd/logcli/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
FROM golang:1.16.2 as build
FROM golang:1.17.2 as build
ARG TOUCH_PROTOS
COPY . /src/loki

2
cmd/loki-canary/Dockerfile
Unescape View File

@ -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

4
cmd/loki-canary/Dockerfile.cross
Unescape View File

@ -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

2
cmd/loki/Dockerfile
Unescape View File

@ -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

4
cmd/loki/Dockerfile.cross
Unescape View File

@ -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

2
cmd/migrate/Dockerfile
Unescape View File

@ -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

2
cmd/querytee/Dockerfile
Unescape View File

@ -1,4 +1,4 @@
FROM golang:1.16.2 as build
FROM golang:1.17.2 as build
ARG TOUCH_PROTOS
COPY . /src/loki

4
cmd/querytee/Dockerfile.cross
Unescape View File

@ -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

2
tools/dev/loki-boltdb-storage-s3/dev.dockerfile
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save