From 2cfe8e28316519d04b9041f44a0510d96f9ae4e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Aug 2023 14:24:13 +0200
Subject: [PATCH] build(deps): bump golang from 1.20.6-alpine to 1.20.7-alpine
in /cmd/loki (#10143)
Bumps golang from 1.20.6-alpine to 1.20.7-alpine.
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
cmd/loki/Dockerfile | 2 +-
cmd/loki/Dockerfile.cross | 2 +-
cmd/loki/Dockerfile.debug | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
index 7340a551dffe4..9a428d7b041f0 100644
--- a/cmd/loki/Dockerfile
+++ b/cmd/loki/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.6 as build
+FROM golang:1.20.7 as build
COPY . /src/loki
WORKDIR /src/loki
diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross
index 5b81cd1b16ed7..f070313ae468a 100644
--- a/cmd/loki/Dockerfile.cross
+++ b/cmd/loki/Dockerfile.cross
@@ -2,7 +2,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
# 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.20.6-alpine as goenv
+FROM golang:1.20.7-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm
diff --git a/cmd/loki/Dockerfile.debug b/cmd/loki/Dockerfile.debug
index 6d748352142a2..235f0d592b0ad 100644
--- a/cmd/loki/Dockerfile.debug
+++ b/cmd/loki/Dockerfile.debug
@@ -3,7 +3,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
# 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.20.6-alpine as goenv
+FROM golang:1.20.7-alpine as goenv
RUN go env GOARCH > /goarch && \
go env GOARM > /goarm && \
go install github.com/go-delve/delve/cmd/dlv@latest