FIx and cleanup docker

Dosenpfand · Aug 2, 2023 · 6715ba7 · 6715ba7
1 parent 0fe16c1
commit 6715ba7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,4 +14,7 @@ RUN set -eux; \
 COPY docker/crontab ${CRONTAB_FILE}
 COPY docker/create_env.sh /root/create_env.sh
 
+# App
+ENV MODULE_NAME=wsgi
+RUN rm -rf /app
 COPY ./ /app
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,11 +3,10 @@ version: '3'
 services:
   app:
     build: ./
-    restart: always
+    restart: unless-stopped
     ports:
       - 5000:80
     environment:
-      - MODULE_NAME=wsgi
       - FLASK_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://zug:zug@postgres:5432/zug
     depends_on:
       postgres:
@@ -21,7 +20,7 @@ services:
 
   cron:
     build: ./
-    restart: always
+    restart: unless-stopped
     environment:
       - FLASK_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://zug:zug@postgres:5432/zug
     depends_on:
@@ -31,7 +30,7 @@ services:
 
   postgres:
     image: postgres:alpine
-    restart: always
+    restart: unless-stopped
     environment:
       - POSTGRES_PASSWORD=zug
       - POSTGRES_DB=zug

diff --git a/docker/prestart.sh → prestart.sh b/docker/prestart.sh → prestart.sh