Use Loki build image 0.27.1 in CI (#8279)

Second part of updating the Loki build image

Signed-off-by: Christian Haudum <christian.haudum@gmail.com>
pull/8283/head
Christian Haudum 3 years ago committed by GitHub
parent be115e98ee
commit 1728d09cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 40
      .drone/drone.yml
  2. 2
      Makefile
  3. 2
      clients/cmd/docker-driver/Dockerfile
  4. 2
      clients/cmd/promtail/Dockerfile.cross
  5. 2
      clients/cmd/promtail/Dockerfile.debug
  6. 2
      cmd/loki-canary/Dockerfile.cross
  7. 2
      cmd/loki/Dockerfile.cross
  8. 2
      cmd/loki/Dockerfile.debug
  9. 2
      cmd/querytee/Dockerfile.cross
  10. 2
      operator/Dockerfile.cross
  11. 2
      tools/go-version-bump.sh

@ -93,14 +93,14 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: check-drone-drift
- commands:
- make BUILD_IN_CONTAINER=false check-generated-files
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: check-generated-files
- commands:
- cd ..
@ -110,7 +110,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: clone-target-branch
when:
event:
@ -121,7 +121,7 @@ steps:
- clone-target-branch
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: test
- commands:
- cd ../loki-target-branch
@ -129,7 +129,7 @@ steps:
depends_on:
- clone-target-branch
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: test-target-branch
when:
event:
@ -142,7 +142,7 @@ steps:
- test
- test-target-branch
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: compare-coverage
when:
event:
@ -158,7 +158,7 @@ steps:
TOKEN:
from_secret: github_token
USER: grafanabot
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: report-coverage
when:
event:
@ -168,7 +168,7 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: lint
- commands:
- make BUILD_IN_CONTAINER=false check-mod
@ -176,7 +176,7 @@ steps:
- test
- lint
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: check-mod
- commands:
- apk add make bash && make lint-scripts
@ -187,28 +187,28 @@ steps:
depends_on:
- check-generated-files
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: loki
- commands:
- make BUILD_IN_CONTAINER=false check-doc
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: check-doc
- commands:
- make BUILD_IN_CONTAINER=false validate-example-configs
depends_on:
- loki
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: validate-example-configs
- commands:
- make BUILD_IN_CONTAINER=false check-example-config-doc
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: check-example-config-doc
- commands:
- mkdir -p /hugo/content/docs/loki/latest
@ -241,7 +241,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: loki-mixin-check
when:
event:
@ -266,7 +266,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: documentation-helm-reference-check
trigger:
ref:
@ -1368,7 +1368,7 @@ steps:
NFPM_SIGNING_KEY:
from_secret: gpg_private_key
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: write-key
- commands:
- make BUILD_IN_CONTAINER=false packages
@ -1376,7 +1376,7 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: test packaging
- commands:
- ./tools/packaging/verify-deb-install.sh
@ -1402,7 +1402,7 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: publish
when:
event:
@ -1436,7 +1436,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.27.0
image: grafana/loki-build-image:0.27.1
name: build and push
privileged: true
volumes:
@ -1673,6 +1673,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 2cf76cc8b2d840ca2a492d8af91bdf2a5e535eee4e821d408e2d81a9b52941d8
hmac: 5624f951bb85d3ea60019de484eb85a68bb75c1fffc16150bfefd1cfa129d52d
...

@ -29,7 +29,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
BUILD_IN_CONTAINER ?= true
# ensure you run `make drone` after changing this
BUILD_IMAGE_VERSION := 0.27.0
BUILD_IMAGE_VERSION := 0.27.1
# Docker image info
IMAGE_PREFIX ?= grafana

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

@ -1,4 +1,4 @@
ARG BUILD_IMAGE=grafana/loki-build-image:0.27.0
ARG BUILD_IMAGE=grafana/loki-build-image:0.27.1
# 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,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.27.0 as build
FROM grafana/loki-build-image:0.27.1 as build
ARG GOARCH="amd64"
COPY . /src/loki
WORKDIR /src/loki

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

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

@ -1,7 +1,7 @@
# 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 .
FROM grafana/loki-build-image:0.27.0 as build
FROM grafana/loki-build-image:0.27.1 as build
ARG GOARCH="amd64"
COPY . /src/loki
WORKDIR /src/loki

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

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

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

Loading…
Cancel
Save