kleinigkeiten für deploy prozess...

docker-compose.base.yaml

@@ -1,32 +1,28 @@
-name: kbpbase
-services:
-  nginx-proxy:
-    build: 
-      context: NGINX_Server
-      args: # Übergibt die ARGS an das dockerfile
-         NGINX_VERSION: ${NGINX_VERSION}
-    
-    ports:
-      - ${NGINX_HOST_PORT}:4430
-    volumes:
-      - ${NGINX_STATIC_DIR}:/usr/share/nginx/html:ro
-      - ${NGINX_CONFIG_TEMPLATE_DIR}:/etc/nginx/templates
-      - ${NGINX_CERTS}:/etc/certs
-    environment:
-      - NGINX_CERT=${NGINX_CERT}
-      - NGINX_CERT_KEY=${NGINX_CERT_KEY}
-      - NGINX_SERVER_NAME=${NGINX_SERVER_NAME}
-  pythonapp:
-    build: 
-      context: App_Server
-      # target: kommt aus dem prod oder dev dockerfile
-      args: # Übergibt die ARGS an das dockerfile
-        PYTHON_VERSION: ${PYTHON_VERSION}
-    volumes:
-      #- ${PYTHON_APP_DIR}:/usr/opt/pythonapp/root
-      - ${PYTHON_DB_DIR}:/usr/var/pythonappdb
-      - python-venv:/usr/opt/pythonapp/env
-      # - ${PYTHON_ENV_DIR}:/usr/opt/pythonapp/env
-
-volumes:
-  python-venv:
+name: kbpbase
+services:
+  nginx-proxy:
+    build: 
+      context: . # Build context im root, damit Client/ und NGINX_Server/ verfügbar sind
+      dockerfile: NGINX_Server/Dockerfile
+      args:
+         NGINX_VERSION: ${NGINX_VERSION}
+    ports:
+      - ${NGINX_HOST_PORT}:4430
+    volumes:
+      - ${NGINX_CONFIG_TEMPLATE_DIR}:/etc/nginx/templates
+      - ${NGINX_CERTS}:/etc/certs
+    env_file:
+      - .env
+  pythonapp:
+    build: 
+      context: App_Server
+      args:
+        PYTHON_VERSION: ${PYTHON_VERSION}
+    env_file:
+      - .env
+    volumes:
+      - ${PYTHON_DB_DIR}:/usr/var/pythonappdb
+      - python-venv:/usr/opt/pythonapp/env
+
+volumes:
+  python-venv: