Merge remote-tracking branch 'origin/0.3' into 0.3

# Conflicts: # kdb-bot/cpl-workspace.json
Updated configs
2022-11-18 09:58:28 +01:00 · 2022-11-18 09:58:05 +01:00 · 2022-11-18 09:52:27 +01:00
2 changed files with 2 additions and 2 deletions
--- a/kdb-bot/cpl-workspace.json
+++ b/kdb-bot/cpl-workspace.json
@@ -37,7 +37,7 @@
      "pre-dev": "cpl build",
      "dev": "export KDB_ENVIRONMENT=development; export KDB_NAME=KDB-Dev; cpl start;",

-      "docker-build": "cpl build $ARGS; cd docker; docker build -t kdb-bot/kdb-bot:$(cd ../; cpl gv; cd docker;) .; cd ..;",
+      "docker-build": "cpl build $ARGS; docker build -t kdb-bot/kdb-bot:$(cpl gv) .;",
      "dc-up": "docker-compose up -d",
      "dc-down": "docker-compose down",
      "docker": "cpl dc-down; cpl docker-build; cpl dc-up;"
--- a/kdb-bot/src/bot/config
+++ b/kdb-bot/src/bot/config
Author	SHA1	Message	Date
Sven Heidemann	fd609eb923	Merge remote-tracking branch 'origin/0.3' into 0.3 # Conflicts: # kdb-bot/cpl-workspace.json	2022-11-18 09:58:28 +01:00
Sven Heidemann	a7dbc75d2e	Updated configs	2022-11-18 09:58:05 +01:00
Sven Heidemann	b0459567f4	Fixed workspace	2022-11-18 09:52:27 +01:00