From cdf6f9fcfdd268c25cd8fd156368402a077721ca Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Wed, 10 Apr 2024 13:52:33 +0200
Subject: [PATCH] declutter by using default filenames

---
 .dockerignore                                 | 3 +--
 .flaskenv                                     | 1 -
 Dockerfile                                    | 2 +-
 boot.sh                                       | 2 +-
 docker-compose/docker-compose.development.yml | 2 +-
 nopaque.py => wsgi.py                         | 0
 6 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 .flaskenv
 rename nopaque.py => wsgi.py (100%)

diff --git a/.dockerignore b/.dockerignore
index 518de1be..edcfc859 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,9 +5,8 @@
 !app
 !migrations
 !tests
-!.flaskenv
 !boot.sh
 !config.py
 !docker-nopaque-entrypoint.sh
-!nopaque.py
 !requirements.txt
+!wsgi.py
diff --git a/.flaskenv b/.flaskenv
deleted file mode 100644
index 1fd672d3..00000000
--- a/.flaskenv
+++ /dev/null
@@ -1 +0,0 @@
-FLASK_APP=nopaque.py
diff --git a/Dockerfile b/Dockerfile
index cfe86518..7f91301c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ COPY docker-nopaque-entrypoint.sh /usr/local/bin/
 COPY --chown=nopaque:nopaque app app
 COPY --chown=nopaque:nopaque migrations migrations
 COPY --chown=nopaque:nopaque tests tests
-COPY --chown=nopaque:nopaque .flaskenv boot.sh config.py nopaque.py requirements.txt ./
+COPY --chown=nopaque:nopaque boot.sh config.py wsgi.py requirements.txt ./
 
 RUN mkdir logs
 
diff --git a/boot.sh b/boot.sh
index 91b688b6..42d0c669 100755
--- a/boot.sh
+++ b/boot.sh
@@ -24,7 +24,7 @@ if [[ "${#}" == "0" ]]; then
             sleep 5
         done
     fi
-    python3 nopaque.py
+    python3 wsgi.py
 elif [[ "${1}" == "flask" ]]; then
     flask ${@:2}
 elif [[ "${1}" == "--help" || "${1}" == "-h" ]]; then
diff --git a/docker-compose/docker-compose.development.yml b/docker-compose/docker-compose.development.yml
index 06aced22..162aa4fa 100644
--- a/docker-compose/docker-compose.development.yml
+++ b/docker-compose/docker-compose.development.yml
@@ -11,6 +11,6 @@ services:
       - "./config.py:/home/nopaque/config.py"
       - "./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
       - "./migrations:/home/nopaque/migrations"
-      - "./nopaque.py:/home/nopaque/nopaque.py"
       - "./requirements.txt:/home/nopaque/requirements.txt"
       - "./tests:/home/nopaque/tests"
+      - "./wsgi.py:/home/nopaque/wsgi.py"
diff --git a/nopaque.py b/wsgi.py
similarity index 100%
rename from nopaque.py
rename to wsgi.py