From e9f15fb7999b3fcec367ecce10136c95e0ecde7b Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Mon, 29 May 2023 18:07:44 +0200
Subject: [PATCH] ref: update compose file

---
 docker/docker-compose.yml => docker-compose.yml | 16 ++++++++--------
 docker/{nginx => web}/Dockerfile                |  0
 docker/{nginx => web}/nginx.conf                |  0
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename docker/docker-compose.yml => docker-compose.yml (74%)
 rename docker/{nginx => web}/Dockerfile (100%)
 rename docker/{nginx => web}/nginx.conf (100%)

diff --git a/docker/docker-compose.yml b/docker-compose.yml
similarity index 74%
rename from docker/docker-compose.yml
rename to docker-compose.yml
index 004bbc8..fc260eb 100755
--- a/docker/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,27 +2,27 @@ version: '3'
 services:
   web:
     container_name: web
-    build:
-      context: nginx
-      dockerfile: Dockerfile
+    build: ./docker/web/Dockerfile
+    working_dir: /etc/nginx
     ports:
       - 80:80
     volumes:
       - django-static:/var/www/html/static
-    working_dir: /etc/nginx
     links:
       - app
+    restart: "on-failure"
+
   app:
     container_name: app
-    build:
-      context: ..
-      dockerfile: Dockerfile
+    build: ./Dockerfile
+    working_dir: /django_project
     environment:
       DJANGO_SECRET_KEY: $DJANGO_SECRET_KEY
       ALLOWED_HOSTS: $ALLOWED_HOSTS
     volumes:
       - django-static:/var/www/html/static
-    working_dir: /django_project
+      - ./data:/django_project/data:rw
+    restart: "on-failure"
 
 volumes:
   django-static:
diff --git a/docker/nginx/Dockerfile b/docker/web/Dockerfile
similarity index 100%
rename from docker/nginx/Dockerfile
rename to docker/web/Dockerfile
diff --git a/docker/nginx/nginx.conf b/docker/web/nginx.conf
similarity index 100%
rename from docker/nginx/nginx.conf
rename to docker/web/nginx.conf