From c3876a190d4754a57cbd80b4dbf1f092c4b0c340 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 23 Oct 2024 12:27:27 +0200
Subject: [PATCH] Need to create the folders
---
.docker/.env | 12 ++++++++++++
.gitignore | 3 ---
.gitlab-ci.yml | 4 ++--
make/dev.mk | 1 +
4 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 .docker/.env
diff --git a/.docker/.env b/.docker/.env
new file mode 100644
index 0000000000..b2f231377d
--- /dev/null
+++ b/.docker/.env
@@ -0,0 +1,12 @@
+# UNCOMMENT THE LINES BELOW TO OVERRIDE
+#BASE_URL=http://example.com
+#ADMIN_EMAIL=noreply@example.com
+#LOG_LEVEL=debug
+#IDENTITY_SERVICE_ADMIN_PASSWORD=admin
+#AUTH_SERVICE_ADMIN_PASSWORD=admin
+#METADATA_DB_PASSWORD=dbrepo
+#DATA_DB_PASSWORD=dbrepo
+#AUTH_DB_PASSWORD=dbrepo
+#S3_ACCESS_KEY_ID=seaweedfsadmin
+#S3_SECRET_ACCESS_KEY=seaweedfsadmin
+#SYSTEM_PASSWORD=admin
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ed77b2683e..8b3805cd13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,9 +60,6 @@ ready
*.key
*.p12
-# Environment
-.env
-
# X509
root.crt
intermediate.crt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f571fba1d1..674cdfb1a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@ variables:
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
PYTHON_VERSION: "3.11"
- APP_VERSION: "1.4.7"
- CHART_VERSION: "1.4.7"
+ APP_VERSION: "1.4.6"
+ CHART_VERSION: "1.4.6"
CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
diff --git a/make/dev.mk b/make/dev.mk
index 76c05989eb..558e7ab309 100644
--- a/make/dev.mk
+++ b/make/dev.mk
@@ -11,6 +11,7 @@ stop-dev: ## Stop the development deployment and remove all data.
.PHONY: package-config
package-config: ## Package the config files
+ mkdir -p ./.docker/config/{dashboards,provisioning}
cp ./dbrepo-auth-service/dbrepo-realm.json ./.docker/config
cp ./dbrepo-auth-service/import-realms.sh ./.docker/config
cp ./dbrepo-auth-service/master-realm.json ./.docker/config
--
GitLab