chore: Update Docker images to Go 1.22.5 (#13398)

pull/13342/head
Paul Rogers 2 years ago committed by GitHub
parent e612dd3dfe
commit ca2f11d93e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      clients/cmd/fluent-bit/Dockerfile
  2. 2
      clients/cmd/promtail/Dockerfile
  3. 2
      clients/cmd/promtail/Dockerfile.arm32
  4. 2
      cmd/logcli/Dockerfile
  5. 2
      cmd/logql-analyzer/Dockerfile
  6. 2
      cmd/loki-canary-boringcrypto/Dockerfile
  7. 2
      cmd/loki-canary/Dockerfile
  8. 2
      cmd/loki-canary/Dockerfile.cross
  9. 2
      cmd/loki/Dockerfile
  10. 2
      cmd/loki/Dockerfile.cross
  11. 2
      cmd/loki/Dockerfile.debug
  12. 2
      cmd/migrate/Dockerfile
  13. 2
      cmd/querytee/Dockerfile
  14. 2
      cmd/querytee/Dockerfile.cross
  15. 4
      tools/go-version-bump.sh
  16. 2
      tools/lambda-promtail/Dockerfile

@ -1,4 +1,4 @@
FROM golang:1.22.2-bullseye AS builder
FROM golang:1.22.5-bullseye AS builder
COPY . /src

@ -1,4 +1,4 @@
FROM golang:1.22.2-bookworm as build
FROM golang:1.22.5-bookworm as build
COPY . /src/loki
WORKDIR /src/loki

@ -1,4 +1,4 @@
FROM golang:1.22.2-bookworm as build
FROM golang:1.22.5-bookworm as build
COPY . /src/loki
WORKDIR /src/loki

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
# 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.22.2-alpine as goenv
FROM golang:1.22.5-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
# 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.22.2-alpine as goenv
FROM golang:1.22.5-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm

@ -3,7 +3,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
# This file is intended to be called from the root like so:
# docker build -t grafana/loki -f cmd/loki/Dockerfile.debug .
FROM golang:1.22.2-alpine as goenv
FROM golang:1.22.5-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm && \
go install github.com/go-delve/delve/cmd/dlv@latest

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false migrate

@ -1,4 +1,4 @@
FROM golang:1.22.2 as build
FROM golang:1.22.5 as build
COPY . /src/loki
WORKDIR /src/loki

@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
# 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.22.2-alpine as goenv
FROM golang:1.22.5-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm

@ -23,6 +23,4 @@ find cmd clients tools loki-build-image -type f -name 'Dockerfile*' -exec grep -
while read -r x; do
echo "Updating ${x}"
${SED} -i -re "s,golang:[0-9\.]+,golang:${VERSION},g" "${x}"
done
echo "Don't forget to update the sha256 hash in clients/cmd/fluent-bit/Dockerfile."
done

@ -1,4 +1,4 @@
FROM golang:1.22.2-alpine AS build-image
FROM golang:1.22.5-alpine AS build-image
COPY tools/lambda-promtail /src/lambda-promtail
WORKDIR /src/lambda-promtail

Loading…
Cancel
Save