Merge branch 'grafana:main' into ci-fix-test

grafana · Oct 2, 2024 · 9666b74 · 9666b74
2 parents 53e8982 + 30528c9
commit 9666b74
Show file tree

Hide file tree

Showing 365 changed files with 26,769 additions and 10,514 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