Merge pull request #29 from rik/28_remove_nginx

Remove Nginx
djangosocialteam · May 15, 2024 · bfc6432 · bfc6432
2 parents b21ca1a + 5d1131c
commit bfc6432
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 84 deletions.
diff --git a/dev-templates/docker-compose.override.yml.tpl b/dev-templates/docker-compose.override.yml.tpl
@@ -13,11 +13,6 @@ services:
       - POSTGRES_USER=djangosocial
     volumes:
       - ./django:/django/
-  djangosocial-nginx:
-    build:
-      target: nginx-dev
-    ports:
-    - ${NGINX_PORT-8000}:80
   djangosocial-postgres:
     environment:
       - POSTGRES_DB=djangosocial

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,22 +15,8 @@ services:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - PYTHONUNBUFFERED=1
     restart: unless-stopped
-    volumes:
-      - ./nginx/media:/mnt/media
-      - ./nginx/static:/mnt/static
-  djangosocial-nginx:
-    build:
-      context: nginx
-      target: nginx-prod
-    container_name: djangosocial-nginx
-    depends_on:
-      - djangosocial-django
-    expose:
-      - "80"
-    restart: unless-stopped
-    volumes:
-      - ./nginx/media:/mnt/media
-      - ./nginx/static:/mnt/static
+    ports:
+      - 8000:8000
   djangosocial-postgres:
     container_name: djangosocial-postgres
     environment:

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
diff --git a/nginx/media/.gitignore b/nginx/media/.gitignore
diff --git a/nginx/nginx.dev.conf b/nginx/nginx.dev.conf
diff --git a/nginx/static/.gitignore b/nginx/static/.gitignore