update

zcemycl · Jul 7, 2024 · e8a7f66 · e8a7f66
1 parent d7bb4db
commit e8a7f66
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 28 deletions.
diff --git a/src/tf/aws-dagster/.env.sample b/src/tf/aws-dagster/.env.sample
@@ -2,3 +2,4 @@ POSTGRES_USER=
 POSTGRES_PASSWORD=
 POSTGRES_DB=
 POSTGRES_PORT=
+DAGSTER_CURRENT_IMAGE=
diff --git a/src/tf/aws-dagster/codelocations/Dockerfile.user_code b/src/tf/aws-dagster/codelocations/Dockerfile.user_code
@@ -32,4 +32,4 @@ EXPOSE ${PORT}
 
 # CMD allows this to be overridden from run launchers or executors that want
 # to run other commands against your repository
-CMD ["dagster", "api", "grpc", "-h", "0.0.0.0", "-p", ${PORT}, "-f", "/opt/dagster/app/etl1/etl1/__init__.py"]
+CMD ["dagster", "api", "grpc", "-h", "0.0.0.0", "-p", "4000", "-m", "etl1"]
diff --git a/src/tf/aws-dagster/dagster.yaml b/src/tf/aws-dagster/dagster.yaml
@@ -14,11 +14,11 @@ run_launcher:
       - DAGSTER_POSTGRES_USER
       - DAGSTER_POSTGRES_PASSWORD
       - DAGSTER_POSTGRES_DB
-    network: net
+    network: dagster_net
     container_kwargs:
       volumes: # Make docker client accessible to any launched containers as well
         - /var/run/docker.sock:/var/run/docker.sock
-        # - /Users/spare/Documents/data/io_manager_storage:/tmp/io_manager_storage
+        - /Users/spare/Documents/data/io_manager_storage:/tmp/io_manager_storage
         # - /Users/spare/Documents/proj/systemDeploy/src/containers/docker/dagster/repo.py:/opt/dagster/app/repo.py
 
 run_storage:

diff --git a/src/tf/aws-dagster/docker-compose.yml b/src/tf/aws-dagster/docker-compose.yml
@@ -8,9 +8,10 @@ x-dagster-common: &dagster_common
     DAGSTER_POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     DAGSTER_POSTGRES_DB: ${POSTGRES_DB}
     DAGSTER_POSTGRES_PORT: ${POSTGRES_PORT}
-  # volumes:
-  #   - /var/run/docker.sock:/var/run/docker.sock
-  # - /Users/spare/Documents/data/io_manager_storage:/tmp/io_manager_storage
+    DAGSTER_CURRENT_IMAGE: ${DAGSTER_CURRENT_IMAGE}
+  volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    - /Users/spare/Documents/data/io_manager_storage:/tmp/io_manager_storage
   networks:
     - net
   depends_on:
@@ -19,6 +20,7 @@ x-dagster-common: &dagster_common
 networks:
   net:
     driver: bridge
+    name: dagster_net
 services:
   dagster-db:
     build:
@@ -65,31 +67,37 @@ services:
       context: .
       dockerfile: codelocations/Dockerfile.user_code
     container_name: dagster_user_code_etl1
+    image: ${DAGSTER_CURRENT_IMAGE}
+    environment:
+      DAGSTER_POSTGRES_USER: ${POSTGRES_USER}
+      DAGSTER_POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      DAGSTER_POSTGRES_DB: ${POSTGRES_DB}
+      DAGSTER_CURRENT_IMAGE: ${DAGSTER_CURRENT_IMAGE}
     restart: always
     networks:
       - net
     depends_on:
       - dagster-db
-  # webserver:
-  #   <<: *dagster_common
-  #   entrypoint:
-  #     - dagster-webserver
-  #     - -h
-  #     - "0.0.0.0"
-  #     - -p
-  #     - "3000"
-  #     - -w
-  #     - workspace.yaml
-  #   container_name: dagster_webserver
-  #   expose:
-  #     - 3000
-  #   ports:
-  #     - 3000:3000
+  webserver:
+    <<: *dagster_common
+    entrypoint:
+      - dagster-webserver
+      - -h
+      - "0.0.0.0"
+      - -p
+      - "3000"
+      - -w
+      - workspace.yaml
+    container_name: dagster_webserver
+    expose:
+      - 3000
+    ports:
+      - 3000:3000
 
-  # daemon:
-  #   <<: *dagster_common
-  #   entrypoint:
-  #     - dagster-daemon
-  #     - run
-  #   container_name: dagster_daemon
-  #   restart: on-failure
+  daemon:
+    <<: *dagster_common
+    entrypoint:
+      - dagster-daemon
+      - run
+    container_name: dagster_daemon
+    restart: on-failure