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

build: Update Loki build image to 0.33.4 (#13396)

Browse Source
pull/13398/head
Paul Rogers 2 years ago committed by GitHub
parent 8c8454b9db
commit efa2be8325
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 31 additions and 27 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
      .devcontainer/devcontainer.json
  2. 6
      .drone/drone.yml
  3. 2
      .github/workflows/check.yml
  4. 4
      .github/workflows/minor-release-pr.yml
  5. 4
      .github/workflows/patch-release-pr.yml
  6. 2
      Makefile
  7. 2
      clients/cmd/docker-driver/Dockerfile
  8. 2
      clients/cmd/promtail/Dockerfile.cross
  9. 2
      clients/cmd/promtail/Dockerfile.debug
  10. 2
      cmd/loki-canary/Dockerfile.cross
  11. 2
      cmd/loki/Dockerfile.cross
  12. 2
      cmd/loki/Dockerfile.debug
  13. 2
      cmd/querytee/Dockerfile.cross
  14. 18
      loki-build-image/Dockerfile
  15. 4
      loki-build-image/README.md
  16. 2
      operator/Dockerfile.cross

2
.devcontainer/devcontainer.json
Unescape View File

@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.33.1",
"image": "grafana/loki-build-image:0.33.4",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},

6
.drone/drone.yml
Unescape View File

@ -139,7 +139,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.3
image: grafana/loki-build-image:0.33.4
name: documentation-helm-reference-check
trigger:
ref:
@ -1085,7 +1085,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.33.3
image: grafana/loki-build-image:0.33.4
name: build and push
privileged: true
volumes:
@ -1308,6 +1308,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 33b9d2962b6dfcf1136ef7602d29e3f32f03b0d90dfd579652cbaf0a4ef2de4b
hmac: 335170654951c8fdd9cb1b96b4290febb74b86ebab07cfe65d680299faa767bf
...

2
.github/workflows/check.yml
Unescape View File

@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.33.3"
"build_image": "grafana/loki-build-image:0.33.4"
"golang_ci_lint_version": "v1.55.1"
"release_lib_ref": "main"
"skip_validation": false

4
.github/workflows/minor-release-pr.yml
Unescape View File

@ -16,7 +16,7 @@ jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@main"
with:
build_image: "grafana/loki-build-image:0.33.3"
build_image: "grafana/loki-build-image:0.33.4"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "main"
skip_validation: false
@ -141,7 +141,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages

4
.github/workflows/patch-release-pr.yml
Unescape View File

@ -16,7 +16,7 @@ jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@main"
with:
build_image: "grafana/loki-build-image:0.33.3"
build_image: "grafana/loki-build-image:0.33.4"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "main"
skip_validation: false
@ -141,7 +141,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages

2
Makefile
Unescape View File

@ -37,7 +37,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
BUILD_IN_CONTAINER ?= true
# ensure you run `make drone` and `make release-workflows` after changing this
BUILD_IMAGE_VERSION ?= 0.33.3
BUILD_IMAGE_VERSION ?= 0.33.4
# Docker image info
IMAGE_PREFIX ?= grafana

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

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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 .

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

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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 clients/cmd/promtail/Dockerfile .

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

@ -2,7 +2,7 @@
# This file is intended to be called from the root like so:
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile.debug .
FROM grafana/loki-build-image:0.33.2 as build
FROM grafana/loki-build-image:0.33.4 as build
ARG GOARCH="amd64"
COPY . /src/loki
WORKDIR /src/loki

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

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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 .

2
cmd/loki/Dockerfile.cross
Unescape View File

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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 .

2
cmd/loki/Dockerfile.debug
Unescape View File

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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.debug .

2
cmd/querytee/Dockerfile.cross
Unescape View File

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
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 .

18
loki-build-image/Dockerfile
Unescape View File

@ -6,7 +6,7 @@
# on how to publish a new build image.
# Install helm (https://helm.sh/) and helm-docs (https://github.com/norwoodj/helm-docs) for generating Helm Chart reference.
FROM golang:1.22.2-bookworm as helm
FROM golang:1.22.5-bookworm as helm
ARG TARGETARCH
ARG HELM_VER="v3.2.3"
RUN curl -L "https://get.helm.sh/helm-${HELM_VER}-linux-$TARGETARCH.tar.gz" | tar zx && \
@ -38,7 +38,7 @@ RUN apk add --no-cache curl && \
FROM alpine:3.18.6 as docker
RUN apk add --no-cache docker-cli docker-cli-buildx
FROM golang:1.22.2-bookworm as drone
FROM golang:1.22.5-bookworm as drone
ARG TARGETARCH
RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_linux_$TARGETARCH".tar.gz | tar zx && \
install -t /usr/local/bin drone
@ -48,35 +48,35 @@ RUN curl -L "https://github.com/drone/drone-cli/releases/download/v1.7.0/drone_l
# Error:
# github.com/fatih/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025
# (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69)
FROM golang:1.22.2-bookworm as faillint
FROM golang:1.22.5-bookworm as faillint
RUN GO111MODULE=on go install github.com/fatih/faillint@v1.12.0
RUN GO111MODULE=on go install golang.org/x/tools/cmd/goimports@v0.7.0
FROM golang:1.22.2-bookworm as delve
FROM golang:1.22.5-bookworm as delve
RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest
# Install ghr used to push binaries and template the release
# This collides with the version of go tools used in the base image, thus we install it in its own image and copy it over.
FROM golang:1.22.2-bookworm as ghr
FROM golang:1.22.5-bookworm as ghr
RUN GO111MODULE=on go install github.com/tcnksm/ghr@9349474
# Install nfpm (https://nfpm.goreleaser.com) for creating .deb and .rpm packages.
FROM golang:1.22.2-bookworm as nfpm
FROM golang:1.22.5-bookworm as nfpm
RUN GO111MODULE=on go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.11.3
# Install gotestsum
FROM golang:1.22.2-bookworm as gotestsum
FROM golang:1.22.5-bookworm as gotestsum
RUN GO111MODULE=on go install gotest.tools/gotestsum@v1.8.2
# Install tools used to compile jsonnet.
FROM golang:1.22.2-bookworm as jsonnet
FROM golang:1.22.5-bookworm as jsonnet
RUN GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1
RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@16dc166166d91e93475b86b9355a4faed2400c18
RUN GO111MODULE=on go install github.com/google/go-jsonnet/cmd/jsonnet@v0.20.0
FROM aquasec/trivy as trivy
FROM golang:1.22.2-bookworm
FROM golang:1.22.5-bookworm
RUN apt-get update && \
apt-get install -qy \
musl gnupg ragel \

4
loki-build-image/README.md
Unescape View File

@ -2,6 +2,10 @@
## Versions
### 0.33.4
- Update to go 1.22.5
### 0.33.2
- Update to go 1.22.2

2
operator/Dockerfile.cross
Unescape View File

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.4
FROM golang:1.22.2-alpine as goenv
RUN go env GOARCH > /goarch && \

Write Preview
Loading…
Cancel
Save