From 9ac6bce08d10af8b3e2611b7c5e93372aaf0b6a2 Mon Sep 17 00:00:00 2001
From: Ivan Ogasawara <ivan.ogasawara@gmail.com>
Date: Tue, 7 May 2024 10:44:35 -0400
Subject: [PATCH] fix deps and user issue

---
 .github/workflows/main.yaml  | 2 +-
 .sugar.yaml                  | 4 ++--
 conda/pip.txt                | 2 ++
 containers/compose-base.yaml | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 28ce65e6..b4e61965 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -135,7 +135,7 @@ jobs:
 
     - name: start services
       run: |
-        sugar ext restart --services superset,airflow,postgres --options -d
+        sugar ext restart --options -d
 
     - name: wait for the services are properly working
       run: |
diff --git a/.sugar.yaml b/.sugar.yaml
index da80e105..3fd08b17 100644
--- a/.sugar.yaml
+++ b/.sugar.yaml
@@ -27,7 +27,7 @@ groups:
       - containers/compose-base.yaml
       - containers/compose-dev.yaml
     services:
-      default: superset,airflow
+      default: superset,airflow,postgres
       available:
         - name: superset
         - name: airflow
@@ -43,7 +43,7 @@ groups:
       - containers/compose-base.yaml
       - containers/compose-prod.yaml
     services:
-      default: superset,airflow
+      default: superset,airflow,postgres
       available:
         - name: superset
         - name: airflow
diff --git a/conda/pip.txt b/conda/pip.txt
index d7a4e656..64750269 100644
--- a/conda/pip.txt
+++ b/conda/pip.txt
@@ -3,3 +3,5 @@ pangres>=4.1
 sodapy
 shillelagh
 sqlalchemy-sybase
+# issue: ImportError: cannot import name 'url_quote' from 'werkzeug.urls'
+Werkzeug>=2.2,<3.0
diff --git a/containers/compose-base.yaml b/containers/compose-base.yaml
index 5f0f96ae..f48cc47a 100644
--- a/containers/compose-base.yaml
+++ b/containers/compose-base.yaml
@@ -54,7 +54,7 @@ services:
         - POSTGRES_EPIGRAPH_DB=${POSTGRES_EPIGRAPH_DB}
     environment:
       AIRFLOW_UID: "${HOST_UID:-1000}"
-    user: "epigraphhub:epigraphhub"
+    user: "airflow"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
       interval: 30s