From 50604cfc0adf4cdb0120cdad63ff2f592facb3fa Mon Sep 17 00:00:00 2001 From: tomoron Date: Sat, 10 Aug 2024 16:16:32 +0200 Subject: [PATCH] works on my machine --- docker-compose/docker-compose.yml | 28 ++++++++----------- .../requirements/djangoserver/Dockerfile | 3 +- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 5f3376c..569b163 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -2,38 +2,34 @@ services: nginx: container_name: nginx volumes: - - djangoserver:/var/www/djangoserver + - website_data:/var/www/djangoserver networks: - transcendence depends_on: - djangoserver - build: - context: requirements/nginx - dockerfile: Dockerfile + build: requirements/nginx ports: - "443:443" - restart: on-failure + restart: always djangoserver: container_name: djangoserver volumes: - - djangoserver:/var/www/djangoserver + - website_data:/var/www/djangoserver networks: - transcendence - build: - context: requirements/djangoserver - dockerfile: Dockerfile - restart: on-failure - expose: - - "9000" + build: requirements/djangoserver + restart: always + ports: + - "9000:9000" volumes: - djangoserver: + website_data: driver: local driver_opts: - type: 'none' - o: 'bind' - device: '/home/edbernar/data/djangoserver' + type: none + o: bind + device: '~/PTME_data' networks: transcendence: diff --git a/docker-compose/requirements/djangoserver/Dockerfile b/docker-compose/requirements/djangoserver/Dockerfile index 30cce97..d0f713f 100644 --- a/docker-compose/requirements/djangoserver/Dockerfile +++ b/docker-compose/requirements/djangoserver/Dockerfile @@ -14,5 +14,6 @@ RUN chmod 755 /var/www/djangoserver/ RUN chown -R www-data:www-data /var/www/djangoserver/ WORKDIR /var/www/djangoserver +STOPSIGNAL SIGKILL -ENTRYPOINT [ "python", "/var/www/djangoserver/server/main.py" ] \ No newline at end of file +ENTRYPOINT [ "python", "/var/www/djangoserver/server/main.py" ]