Merge branch 'main' into patch-1

grafana · Sep 28, 2024 · 8940036 · 8940036
2 parents 46c7f51 + 84788ad
commit 8940036
Show file tree

Hide file tree

Showing 381 changed files with 11,714 additions and 9,645 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "grafana/loki-build-image:0.33.6",
+  "image": "grafana/loki-build-image:0.34.0",
   "containerEnv": {
     "BUILD_IN_CONTAINER": "false"
   },

diff --git a/.drone/docker-manifest-build-image.tmpl b/.drone/docker-manifest-build-image.tmpl
diff --git a/.drone/docker-manifest-ecr.tmpl b/.drone/docker-manifest-ecr.tmpl
diff --git a/.drone/docker-manifest-operator.tmpl b/.drone/docker-manifest-operator.tmpl
diff --git a/.drone/docker-manifest.tmpl b/.drone/docker-manifest.tmpl