From d0bbeffbb246fb99e3f3d90fd33bf0c08eaee4ec Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Mon, 28 Nov 2022 15:59:01 +0200 Subject: [PATCH] Update delve version to be compatible with Go 1.19 (#7793) In order to use the `production/docker` with an interactive debugger, we need to upgrade the Delve tool to a version that works with the version of Go which Loki uses: 1.19 --- cmd/loki/Dockerfile.debug | 3 +-- loki-build-image/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/loki/Dockerfile.debug b/cmd/loki/Dockerfile.debug index 76d8494347..0cd3819520 100644 --- a/cmd/loki/Dockerfile.debug +++ b/cmd/loki/Dockerfile.debug @@ -1,8 +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 as build +FROM grafana/loki-build-image:0.24.2 as build ARG GOARCH="amd64" COPY . /src/loki WORKDIR /src/loki diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile index bf400c01e1..9936b212f1 100644 --- a/loki-build-image/Dockerfile +++ b/loki-build-image/Dockerfile @@ -51,7 +51,7 @@ FROM golang:1.19.2 as faillint RUN GO111MODULE=on go install github.com/fatih/faillint@v1.10.0 FROM golang:1.19.2 as delve -RUN GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@v1.7.3 +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.