From 66aa08703eed038ae649dceadb4fe11529880e26 Mon Sep 17 00:00:00 2001 From: Joni Joensuu Date: Mon, 21 Aug 2023 19:35:56 +0300 Subject: [PATCH 1/3] update pouta documentation --- docs/pouta.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docs/pouta.md b/docs/pouta.md index 939c5db1..ae56b7dc 100644 --- a/docs/pouta.md +++ b/docs/pouta.md @@ -168,17 +168,6 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_read_timeout 120s; - - # Add CORS headers - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Max-Age' 1728000 always; - add_header 'Content-Type' 'text/plain charset=UTF-8' always; - add_header 'Content-Length' 0 always; - return 204; - } - - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type' always; } location / { From c45a62e7cd09fa1fdb796b67ccc7274c8b9b3ad7 Mon Sep 17 00:00:00 2001 From: Joni Joensuu Date: Mon, 21 Aug 2023 19:44:32 +0300 Subject: [PATCH 2/3] debug mode off in prod --- .github/workflows/cd.yml | 5 ++++- generate_local_env.sh | 1 + recommender-back/src/app.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7d4093a7..e76103fc 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -23,7 +23,10 @@ jobs: - name: Setup .env file for frontend run: echo "REACT_APP_BACKEND_URL=${{ secrets.REACT_APP_BACKEND_URL }}" > ./recommender-front/.env.local - name: Setup .env file for backend - run: echo "REACT_APP_BACKEND_URL=${{ secrets.REACT_APP_BACKEND_URL }}" > ./recommender-back/.env && echo "MONGO_URI=${{ secrets.MONGO_URI }}" >> ./recommender-back/.env + run: | + echo "REACT_APP_BACKEND_URL=${{ secrets.REACT_APP_BACKEND_URL }}" > ./recommender-back/.env + echo "MONGO_URI=${{ secrets.MONGO_URI }}" >> ./recommender-back/.env + echo "FLASK_DEBUG=False" >> ./recommender-back/.env - name: Build and push frontend uses: docker/build-push-action@v2 with: diff --git a/generate_local_env.sh b/generate_local_env.sh index c6573932..34831f47 100755 --- a/generate_local_env.sh +++ b/generate_local_env.sh @@ -25,6 +25,7 @@ cat > ./recommender-back/.env << EOF REACT_APP_BACKEND_URL=http://localhost:5000 DEVELOPMENT_DB_URI="$1" CACHE_MODE="simple" +FLASK_DEBUG="True" # Include the 'recommender-back' directory in the PYTHONPATH. PYTHONPATH="${PYTHONPATH}:${SCRIPT_DIR}/recommender-back" diff --git a/recommender-back/src/app.py b/recommender-back/src/app.py index d829bc0d..416065b0 100644 --- a/recommender-back/src/app.py +++ b/recommender-back/src/app.py @@ -15,7 +15,7 @@ CACHE_TYPE = 'redis' config = { - "DEBUG": True, + "DEBUG": os.environ.get('FLASK_DEBUG', 'False').lower() == 'true', "CACHE_TYPE": CACHE_TYPE, "CACHE_REDIS_URL": Config.CACHE_REDIS_URL, "CACHE_DEFAULT_TIMEOUT": 3600 From e19360c0a602fc3b226f60cfd0604a109068c4f9 Mon Sep 17 00:00:00 2001 From: Joni Joensuu Date: Mon, 21 Aug 2023 19:49:11 +0300 Subject: [PATCH 3/3] ubuntu_default network command --- docs/pouta.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/pouta.md b/docs/pouta.md index ae56b7dc..6e472367 100644 --- a/docs/pouta.md +++ b/docs/pouta.md @@ -70,6 +70,9 @@ $ sudo docker container prune # Remove all of the containers and images $ sudo docker rm -f $(docker ps -a -q) $ sudo docker rmi -f $(docker images -a -q) + +# create ubuntu_default network it it's removed +$ sudo docker create network ubuntu_default ``` ## Removing old Docker images in Pouta