diff --git a/API b/API index 6588241220c36387a1f14ffeefeaca86bea22edc..8e4bf148fe846f5ce2faf8577c164bdcddce833c 160000 --- a/API +++ b/API @@ -1 +1 @@ -Subproject commit 6588241220c36387a1f14ffeefeaca86bea22edc +Subproject commit 8e4bf148fe846f5ce2faf8577c164bdcddce833c diff --git a/Proxy/default.conf b/Proxy/default.conf index d8bab19e96480f90e9ae486416484e4be54d2ca5..016b22a338f4765a6a8745e82c2042f3687e7321 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 56ae464665e191864ba833c99502639e1488035b..9abf644707b7befcdc7c4d0962ca1d1b0d56ae33 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."