changes to bugs

Author: romer8

Dockerfile

@@ -1,26 +1,5 @@
 FROM tethysplatform/tethys-core:dev-py3.10-dj3.2 as base
 
-ARG MAMBA_DOCKERFILE_ACTIVATE=1
-
-#############
-# ADD FILES #
-#############
-
-COPY apps ${TETHYS_HOME}/apps
-COPY requirements/*.txt .
-
-########################
-# INSTALL APPLICATIONS #
-########################
-RUN micromamba install --yes -c conda-forge --file requirements.txt && \
-    cd ${TETHYS_HOME}/apps/tethysapp-geoglows_dashboard && tethys install -w -N -q && \
-    cd ${TETHYS_HOME}/apps/ggst && tethys install -w -N -q && \
-    cd ${TETHYS_HOME}/apps/gwdm && tethys install -w -N -q
-    
-
-# Final Image Build
-FROM tethysplatform/tethys-core:dev-py3.10-dj3.2 as build
-
 
 ENV TETHYS_DOMAIN="localhost"
 ENV TETHYS_THREDDS_PROTOCOL="http"
@@ -69,16 +48,30 @@ ENV THREDDS_TDS_PUBLIC_HOST=""
 ENV THREDDS_TDS_PRIVATE_HOST=""
 
 
+ARG MAMBA_DOCKERFILE_ACTIVATE=1
 
-COPY --chown=www:www --from=base ${CONDA_HOME}/envs/${CONDA_ENV_NAME} ${CONDA_HOME}/envs/${CONDA_ENV_NAME}
-COPY config/apps/post_setup_gwdm.py ${TETHYS_HOME}
-COPY salt/ /srv/salt/
+#############
+# ADD FILES #
+#############
 
-ARG MAMBA_DOCKERFILE_ACTIVATE=1
+COPY apps ${TETHYS_HOME}/apps
+COPY requirements/*.txt .
 
-RUN rm -Rf ~/.cache/pip && \
+########################
+# INSTALL APPLICATIONS #
+########################
+RUN micromamba install --yes -c conda-forge --file requirements.txt && \
     micromamba install --yes -c conda-forge numpy==1.26.4 && \
-    micromamba clean --all --yes
+    micromamba clean --all --yes && \
+    rm -Rf ~/.cache/pip && \
+    cd ${TETHYS_HOME}/apps/tethysapp-geoglows_dashboard && tethys install -w -N -q && \
+    cd ${TETHYS_HOME}/apps/ggst && tethys install -w -N -q && \
+    cd ${TETHYS_HOME}/apps/gwdm && tethys install -w -N -q
+
+
+COPY config/apps/post_setup_gwdm.py ${TETHYS_HOME}
+COPY salt/ /srv/salt/
+
 
 EXPOSE 80
 CMD bash -c "salt-call --local state.apply -l info | tee /var/log/salt.log && bash run.sh"

salt/geoglows_dashboard.sls

@@ -29,7 +29,7 @@
 {% set POSTGIS_SERVICE_NAME = salt['environ.get']('POSTGIS_SERVICE_NAME') %}
 {% set GS_SERVICE_NAME = salt['environ.get']('GS_SERVICE_NAME') %}
 
-{% set DATA_FILE_DESTINATION = APPLICATION_PATH + '/workspaces/app_workspaces/hydrosos/streamflow/vpu_122' %}
+{% set DATA_FILE_DESTINATION = APPLICATION_PATH + '/workspaces/app_workspace/hydrosos/streamflow/vpu_122' %}
 {% set DATA_FILE_URL = 'https://geoglows-dashboard-data.s3.us-east-2.amazonaws.com/combined_all_data_122.nc' %}
 
 
@@ -64,16 +64,10 @@ VerifyFile:
     - require:
       - file: EnsureDirectoryExists
 
-# DownloadFile: 
-#     cmd.run:
-#         - name: wget -O {{ DATA_FILE_DESTINATION }}/combined_all_data_122.nc {{ DATA_FILE_URL }}
-#         - shell: /bin/bash
-#         - require:
-#             - file: {{ DATA_FILE_DESTINATION }}
 
 Initiate_Geoserver:
     cmd.run: 
-        - name: "tethys manage shell < {{ APPLICATION_PATH }}/init_geoserver.py"
+        - name: "cd {{ APPLICATION_PATH }} && tethys manage shell < init_geoserver.py"
         - shell: /bin/bash
         - cwd: {{ APPLICATION_PATH }}
         - stream: True
@@ -82,7 +76,7 @@ Initiate_Geoserver:
 
 Initiate_River_Tables:
     cmd.run: 
-        - name: "tethys manage shell < {{ APPLICATION_PATH }}/init_database.py"
+        - name: "cd {{ APPLICATION_PATH }} &&  tethys manage shell < init_database.py"
         - shell: /bin/bash
         - cwd: {{ APPLICATION_PATH }}
         - stream: True

salt/ggst.sls

@@ -20,13 +20,6 @@
 {% set DATA_FOLDER_URL = 'https://geoglows-dashboard-data.s3.us-east-2.amazonaws.com/thredds/ggst' %}
 
 
-# GGST_tHREDDS_Download_Data: 
-#     cmd.run:
-#         - name: wget -O {{ GGST_CS_THREDDS_DIRECTORY }} {{ DATA_FOLDER_URL }}
-#         - shell: /bin/bash
-#         - require:
-#             - file: {{ GGST_CS_THREDDS_DIRECTORY }}
-
 Set_GGST_Settings:
   cmd.run:
     - name: > 

salt/gwdm.sls

@@ -39,12 +39,6 @@
 
 {% set DATA_FOLDER_URL = 'https://geoglows-dashboard-data.s3.us-east-2.amazonaws.com/thredds/gwdm' %}
 
-# GWDM_tHREDDS_Download_Data: 
-#     cmd.run:
-#         - name: wget -O {{ GWDM_CS_DATA_DIRECTORY_PATH }} {{ DATA_FOLDER_URL }}
-#         - shell: /bin/bash
-#         - require:
-#             - file: {{ GWDM_CS_DATA_DIRECTORY_PATH }}
 
 
 Link_Persistent_Stores_Database_GWDM: