fix dockerfile

USC-InfoLab · Feb 16, 2024 · 759153b · 759153b
1 parent db5787d
commit 759153b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,15 +6,8 @@ COPY . .
 
 RUN pip install -r requirements.txt
 
-<<<<<<< HEAD
-RUN ls
-
 RUN chmod +x /app/inituser_and_start.sh
 
 CMD ["./app/inituser_and_start.sh"]
-=======
-RUN chmod +x /app/inituser_and_start.sh
 
-CMD ["./inituser_and_start.sh"]
->>>>>>> 5336d8cbb43d02384e2ba0e67982f8b5efe19783
 
diff --git a/conf/config.yaml b/conf/config.yaml
@@ -22,7 +22,7 @@ mapping:
         user_id: String(50)
       name: geomts_users
 database1:
-  nickname: 'local'
+  nickname: 'local db'
   dbms: 'postgresql'
   host: 'db'
   port: 5432

diff --git a/inituser_and_start.sh b/inituser_and_start.sh
@@ -10,4 +10,4 @@ wget
 lsb_release
 gnupg
 service postgresql start
-/etc/postgresql/{version}/main/pg_hba.conf
+/etc/postgresql/{version}/main/pg_hba.
diff --git a/viz.py b/viz.py
@@ -20,7 +20,6 @@
 from script.import_hub_main import import_page
 import geopandas as gpd
 from shapely import wkb
-from st_btn_select import st_btn_select
 
 
 from script.query_history import query_history