Merge branch 'main' into chunk_alibaba_oss

# Conflicts: # docs/sources/configuration/_index.md # docs/sources/configuration/examples.md # go.mod # go.sum # pkg/storage/config/schema_config.go # pkg/storage/factory.go # vendor/modules.txt
grafana · Feb 6, 2023 · 84f8fb3 · 84f8fb3
2 parents f668477 + 4d55a24
commit 84f8fb3
Show file tree

Hide file tree

Showing 6,337 changed files with 1,271,083 additions and 248,950 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+production/docker/.data
+.cache
diff --git a/.drone/docker-manifest-ecr.tmpl b/.drone/docker-manifest-ecr.tmpl
@@ -0,0 +1,21 @@
+image: public.ecr.aws/grafana/{{config.target}}:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{build.branch}}-{{substr 0 7 build.commit}}{{/if}}
+tags:
+  - main
+{{#if build.tag}}
+  - latest
+{{/if}}
+{{#if build.tags}}
+{{#each build.tags}}
+  - {{this}}
+{{/each}}
+{{/if}}
+manifests:
+  - image: public.ecr.aws/grafana/{{config.target}}:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{build.branch}}-{{substr 0 7 build.commit}}{{/if}}-amd64
+    platform:
+      architecture: amd64
+      os: linux
+  - image: public.ecr.aws/grafana/{{config.target}}:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{build.branch}}-{{substr 0 7 build.commit}}{{/if}}-arm64
+    platform:
+      architecture: arm64
+      os: linux
+      variant: v8