Merge pull request #559 from elixir-luxembourg/move-nginx-to-volume

Move nginx config to template

Author: moustaphacheikh

.gitignore

@@ -173,3 +173,4 @@ web/static/js/*.bundle.js.LICENSE.txt
 /documents
 /web/static/css/daisy.min.css
 /web/static/css/daisy.css
+/docker/nginx/nginx.conf

doc/deployment.md

@@ -24,6 +24,19 @@ Create a `.env` file in the project root to override default environment variabl
 
 ## Installation
 
+### Configure Nginx
+
+Copy the Nginx configuration template:
+
+```bash
+cp ./docker/nginx/nginx.conf.template ./docker/nginx/nginx.conf
+```
+Customize `nginx.conf` as needed and then start or restart the Nginx service:
+
+```bash
+docker compose restart nginx
+```
+
 ### Build and Start Services
 
 Build and start all services defined in `docker-compose.yaml`:

docker-compose.yaml

@@ -21,6 +21,8 @@ services:
     db:
         image: postgres:16.4-bullseye
         restart: unless-stopped
+        expose:
+            - "5432"
         environment:
             POSTGRES_PASSWORD: ${DB_PASSWORD:-daisy}
             POSTGRES_USER: ${DB_USER:-daisy}
@@ -35,6 +37,7 @@ services:
         restart: unless-stopped
         volumes:
             - statics:/public/static:ro
+            - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
         ports:
             - '80:80'
             - '443:443'
@@ -46,8 +49,8 @@ services:
     solr:
         build: ./docker/solr
         restart: unless-stopped
-        ports:
-            - "8983:8983"
+        expose:
+            - "8983"
         networks:
             - daisy_network
         volumes:
@@ -58,15 +61,15 @@ services:
         restart: unless-stopped
         networks:
             - daisy_network
-        ports:
-            - "15672:15672"
-            - "5672:5672"
+        expose:
+            - "15672"
+            - "5672"
     # task monitoring
     flower:
         image: mher/flower:0.9.7
         command: --broker=amqp://guest:guest@mq:5672// --broker_api=http://guest:guest@mq:15672/api/
-        ports:
-            - "5555:5555"
+        expose:
+            - "5555"
         restart: unless-stopped
         networks:
             - daisy_network

docker/nginx/Dockerfile

@@ -1,4 +1,4 @@
 FROM nginx:alpine
-COPY nginx.conf /etc/nginx/nginx.conf
+RUN rm /etc/nginx/nginx.conf
 COPY server.key /etc/nginx/ssl/private/server.key
 COPY server.crt /etc/nginx/ssl/certs/server.crt

docker/nginx/nginx.conf docker/nginx/nginx.conf.template

@@ -38,7 +38,27 @@ http {
             server_name  localhost;
             listen 80 default_server;
             listen [::]:80 default_server;
+            
+            # Comment the line below to disable HTTPS redirect and use HTTP directly
             return  302 https://$host$request_uri;
+            
+            # Uncomment these location blocks when you want to serve HTTP directly
+            # location @proxy_to_app {
+            #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            #     proxy_set_header X-Forwarded-Proto http;
+            #     proxy_set_header X-Real-IP $remote_addr;
+            #     proxy_set_header Host $http_host;
+            #     proxy_redirect off;
+            #     proxy_pass http://app_server;
+            # }
+            #
+            # location /static/ {
+            #     root /public/ ;
+            # }
+            #
+            # location / {
+            #     try_files $uri $uri/ @proxy_to_app;
+            # }
     }
 
     server_tokens off;