From 4131f6b13b94692d9e8794b87c184a5b72ece7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <git@minelli.swiss>
Date: Mon, 21 Oct 2024 20:21:52 +0200
Subject: [PATCH] Update API
---
API | 2 +-
Proxy/default.conf | 2 +-
infra | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/API b/API
index 6588241..8e4bf14 160000
--- a/API
+++ b/API
@@ -1 +1 @@
-Subproject commit 6588241220c36387a1f14ffeefeaca86bea22edc
+Subproject commit 8e4bf148fe846f5ce2faf8577c164bdcddce833c
diff --git a/Proxy/default.conf b/Proxy/default.conf
index d8bab19..016b22a 100644
--- a/Proxy/default.conf
+++ b/Proxy/default.conf
@@ -50,7 +50,7 @@ server {
rewrite ^ $request_uri;
rewrite ^/dojo/api(/.*) $1 break;
return 400;
- proxy_pass http://dojo-api:30992$uri;
+ proxy_pass http://dojo-api:30993$uri;
proxy_intercept_errors on;
proxy_http_version 1.1;
diff --git a/infra b/infra
index 56ae464..9abf644 100755
--- a/infra
+++ b/infra
@@ -32,7 +32,7 @@ CPU_LIMIT=${CPU_LIMIT} ${DOCKER_COMPOSE_COMMAND} kill
if [ "$1" = "--run" ]; then
# Check if .env file exists
if [ -f $ENV_FILE ]; then
- cp -f $ENV_FILE API/$ENV_FILE
+ cat $ENV_FILE API/ExpressAPI/config.env > API/.env
CPU_LIMIT=${CPU_LIMIT} ${DOCKER_COMPOSE_COMMAND} --env-file ${ENV_FILE} up --build -d
else
echo "Need a file named ${ENV_FILE} providing environment variables."
--
GitLab