wip

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

.docker/dagster/Dockerfile

@@ -5,10 +5,6 @@ FROM python:3.10-slim
 
 # ENV DAGSTER_PASSWORD=$DAGSTER_PASSWORD
 # ENV DAGSTER_USERNAME=$DAGSTER_USERNAME
-# Set environment variables for Dagster
-ENV DAGSTER_HOME=/opt/dagster/dagster_home/ \
-    DAGSTER_USERNAME=zlv \
-    DAGSTER_PASSWORD=zlv
 
 RUN apt-get update && apt-get install -y nginx apache2-utils
 
@@ -19,6 +15,8 @@ COPY analytics/dagster/requirements.txt .
 
 RUN pip install -r requirements.txt
 
+ENV DAGSTER_HOME=/opt/dagster/dagster_home/
+
 RUN mkdir -p $DAGSTER_HOME
 
 COPY analytics/dagster/dagster.yaml analytics/dagster/workspace.yaml $DAGSTER_HOME
@@ -27,13 +25,15 @@ COPY analytics/dagster/src $DAGSTER_HOME/src
 
 WORKDIR $DAGSTER_HOME
 
-# Configure Nginx using a custom nginx.conf file
-RUN htpasswd -cb /etc/nginx/.htpasswd zlv zlv \
-    && rm /etc/nginx/sites-enabled/default \
-    && cp /etc/nginx/nginx.conf /etc/nginx/nginx.conf.backup  # Backup the original config
+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
 
 
 EXPOSE 8080 3000
 
-CMD nginx -t && service nginx start && dagster-webserver -h 0.0.0.0 -p 3000
+CMD service nginx start && dagster-webserver -h 0.0.0.0 -p 3000

analytics/dagster/docker/nginx/nginx.conf

@@ -1,15 +1,16 @@
-server {
-    listen 8080;
+http {
+    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;
+        }
     }
-}
-3. B
+}