From 1e7af490f443cdac41b3184d1b00df5532de71a1 Mon Sep 17 00:00:00 2001 From: 0gis0 Date: Mon, 30 Dec 2024 09:36:05 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20Update=20Dockerfile=20and=20configurat?= =?UTF-8?q?ion=20files=20for=20compatibility=20and=20enhancements=20?= =?UTF-8?q?=F0=9F=94=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/Dockerfile | 2 +- .devcontainer/docker-compose.yml | 2 +- .devcontainer/loki-config.yml | 4 ++-- .vscode/settings.json | 2 +- docs/code-style copy.md | 2 -- docs/commit-style.md | 2 ++ 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 docs/code-style copy.md create mode 100644 docs/commit-style.md diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index eb3c55f..1d820c2 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/dotnet:9.0 +FROM mcr.microsoft.com/devcontainers/dotnet:8.0 # Install SQL Tools: SQLPackage and sqlcmd COPY mssql/installSQLtools.sh installSQLtools.sh diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 13c7a03..b074d41 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -49,7 +49,7 @@ services: loki: image: grafana/loki:latest - command: -config.file=/mnt/config/loki-config.yml + command: -config.file=/mnt/config/loki-config.yml -config.expand-env=true ports: - "3100:3100" networks: diff --git a/.devcontainer/loki-config.yml b/.devcontainer/loki-config.yml index 77a6e69..81664f2 100644 --- a/.devcontainer/loki-config.yml +++ b/.devcontainer/loki-config.yml @@ -33,7 +33,7 @@ storage_config: filesystem: directory: /tmp/loki/chunks -limits_config: - enforce_metric_name: false +limits_config: + allow_structured_metadata: false reject_old_samples: true reject_old_samples_max_age: 168h \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 5dcb8b8..918f3c3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,7 +18,7 @@ "text": "Add emoji at the end of the message." }, { - "file": "docs/code-style copy.md" + "file": "docs/commit-style.md" } ], "github.copilot.chat.testGeneration.instructions": [ diff --git a/docs/code-style copy.md b/docs/code-style copy.md deleted file mode 100644 index 82e5132..0000000 --- a/docs/code-style copy.md +++ /dev/null @@ -1,2 +0,0 @@ -## Commit messages -The key to a good commit is clarity and conciseness. If the commit is for a new feature should start with `feat: `, if it's for fixing a bug should start with `fix: `, if it's for performance improvements should start with `perf: `, if its for style or layout changes should start with `style: `, for minimum changes with no significant impact `chore: ` and for documentation `docs: `. The most important thing it to keep the messages clear and precise so that everyone working on the project can quickly understand the changes made. \ No newline at end of file diff --git a/docs/commit-style.md b/docs/commit-style.md new file mode 100644 index 0000000..67362cd --- /dev/null +++ b/docs/commit-style.md @@ -0,0 +1,2 @@ +## Commit messages +If the commit is for a new feature should start with `feat: `, if it's for fixing a bug should start with `fix: `, if it's for performance improvements should start with `perf: `, if its for style or layout changes should start with `style: `, for minimum changes with no significant impact `chore: ` and for documentation `docs: `. \ No newline at end of file