Use new build image everywhere (#8063)

Use the latest build image everywhere.

Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
pull/8086/head
Michel Hollands 3 years ago committed by GitHub
parent b8f26c55a7
commit 1e143ace11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .drone/drone.jsonnet
  2. 6
      .drone/drone.yml
  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. 15
      loki-build-image/version-updater.sh
  11. 2
      operator/Dockerfile.cross

@ -446,7 +446,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
[
pipeline('loki-build-image') {
local build_image_tag = '0.25.0',
local build_image_tag = '0.26.0',
workspace: {
base: '/src',
path: 'loki',

@ -10,7 +10,7 @@ steps:
dry_run: true
repo: grafana/loki-build-image
tags:
- 0.25.0
- 0.26.0
when:
event:
- pull_request
@ -26,7 +26,7 @@ steps:
from_secret: docker_password
repo: grafana/loki-build-image
tags:
- 0.25.0
- 0.26.0
username:
from_secret: docker_username
when:
@ -1633,6 +1633,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: b07d95d16c5f0170c2f5c16a7b73a73b5c3989b531bf4a79e8487166cc8bf77b
hmac: 62f0aea10366a3c443c26cdc0b088eae7825d731a8651165148b2c102c1ffc93
...

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

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

@ -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.25.0 as build
FROM grafana/loki-build-image:0.26.0 as build
ARG GOARCH="amd64"
COPY . /src/loki
WORKDIR /src/loki

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

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

@ -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.25.0 as build
FROM grafana/loki-build-image:0.26.0 as build
ARG GOARCH="amd64"
COPY . /src/loki
WORKDIR /src/loki

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

@ -2,6 +2,15 @@
set -euo pipefail
# The BSD version of the sed command in MacOS doesn't work with this script.
# Please install gnu-sed via `brew install gnu-sed`.
# The gsed command becomes available then.
SED="sed"
if command -v gsed &> /dev/null ; then
echo "Using gsed"
SED="gsed"
fi
VERSION="${1-}"
if [[ -z "${VERSION}" ]]; then
>&2 echo "Usage: $0 <version>"
@ -10,8 +19,8 @@ fi
echo "Updating loki-build-image references to '${VERSION}'"
find . -type f \( -name '*.yml' -o -name '*.yaml' -o -name '*Dockerfile*' \) -exec grep -lP "grafana/loki-build-image:[0-9]+" {} \; | grep -ve '.drone' |
find . -type f \( -name '*.yml' -o -name '*.yaml' -o -name '*Dockerfile*' \) -exec grep -lE "grafana/loki-build-image:[0-9]+" {} \; | grep -ve '.drone' |
while read -r x; do
echo "Updating ${x}"
sed -i -re "s,grafana/loki-build-image:[0-9]+\.[0-9]+\.[0-9]+,grafana/loki-build-image:${VERSION},g" "${x}"
done
${SED} -i -re "s,grafana/loki-build-image:[0-9]+\.[0-9]+\.[0-9]+,grafana/loki-build-image:${VERSION},g" "${x}"
done

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

Loading…
Cancel
Save