wip

Signed-off-by: Raphaël Courivaud <[email protected]>

.docker/dagster/Dockerfile

@@ -25,14 +25,9 @@ COPY analytics/dagster/src $DAGSTER_HOME/src
 
 WORKDIR $DAGSTER_HOME
 
+# Setup Nginx configuration
 RUN htpasswd -cb /etc/nginx/.htpasswd zlv zlv
-
-RUN rm /etc/nginx/sites-enabled/default
-ADD analytics/dagster/docker/nginx/nginx.conf /etc/nginx/sites-available/dagster
-RUN ln -s /etc/nginx/sites-available/dagster /etc/nginx/sites-enabled/dagster
-
-COPY analytics/dagster/docker/nginx/nginx.conf /etc/nginx/nginx.conf
-
+COPY docker/nginx/nginx.conf /etc/nginx/sites-available/default
 
 EXPOSE 8080 3000
 

analytics/dagster/Dockerfile

@@ -2,6 +2,8 @@ FROM python:3.10-slim
 
 RUN pip install dagster-webserver dagster-postgres dagster-aws
 
+RUN apt-get update && apt-get install -y nginx apache2-utils
+
 RUN ls 
 # Install dependencies
 COPY requirements.txt .
@@ -19,6 +21,12 @@ COPY src/ $DAGSTER_HOME
 
 WORKDIR $DAGSTER_HOME
 
-EXPOSE 3000
+# Setup Nginx configuration
+RUN htpasswd -cb /etc/nginx/.htpasswd zlv zlv
+COPY docker/nginx/nginx.conf /etc/nginx/sites-available/default
+
+# Expose port 80 for the Nginx web server
+EXPOSE 8080
+
+CMD nginx -g 'daemon off;' & dagster-webserver -h 0.0.0.0 -p 3000
 
-ENTRYPOINT ["dagster-webserver", "-h", "0.0.0.0", "-p", "3000"]

analytics/dagster/docker/nginx/nginx.conf

@@ -1,16 +1,14 @@
-http {
-    server {
-        listen 8080;
+server {
+    listen 8080;
 
-        location / {
-            auth_basic "Restricted Access";
-            auth_basic_user_file /etc/nginx/.htpasswd;
+    location / {
+        auth_basic "Restricted Access";
+        auth_basic_user_file /etc/nginx/.htpasswd;
 
-            proxy_pass http://127.0.0.1:3000;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-        }
+        proxy_pass http://127.0.0.1:3000;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 }

analytics/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     env_file:
       - .env
     ports:
-      - 3000:3000
+      - 8080:8080
 
   postgres:
     image: postgres:latest