Skip to content

Commit

Permalink
added changes to not rely on update script
Browse files Browse the repository at this point in the history
  • Loading branch information
romer8 committed Oct 15, 2024
1 parent 766d12e commit 2bd0e94
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 487 deletions.
25 changes: 11 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \
micromamba clean --all --yes && \
export PYTHON_SITE_PACKAGE_PATH=$(${CONDA_HOME}/envs/${CONDA_ENV_NAME}/bin/python -m site | grep -a -m 1 "site-packages" | head -1 | sed 's/.$//' | sed -e 's/^\s*//' -e '/^$/d'| sed 's![^/]*$!!' | cut -c2-) &&\
cd ${TETHYS_HOME}/extensions/tethysext-ciroh_theme && python setup.py install && \
cd ${TETHYS_HOME}/apps/tethysapp-tethys_app_store && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/app_store.yml && \
cd ${TETHYS_HOME}/apps/ggst && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/ggst.yml && \
cd ${TETHYS_HOME}/apps/tethysapp-metdataexplorer && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/metdataexplorer.yml && \
cd ${TETHYS_HOME}/apps/tethysapp-swe && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/swe.yml && \
cd ${TETHYS_HOME}/apps/tethysapp-hydrocompute && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/hydrocompute.yml && \
cd ${TETHYS_HOME}/apps/gwdm && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/gwdm.yml && \
cd ${TETHYS_HOME}/apps/snow-inspector && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/snow-inspector.yml && \
cd ${TETHYS_HOME}/apps/aquainsight && mv ${TETHYS_HOME}/apps/aquainsight/reactapp/config/development.env ${TETHYS_HOME}/apps/aquainsight/reactapp/config/production.env && npm install && npm run build && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/aquainsight.yml && \
cd ${TETHYS_HOME}/apps/Tethys-CSES && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/community_streamflow_evaluation_system.yml && \
cd ${TETHYS_HOME}/apps/hydroshare_api_tethysapp && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/hydroshare_api_tethysapp.yml && \
cd ${TETHYS_HOME}/apps/Water-Data-Explorer && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/water_data_explorer.yml && \
cd ${TETHYS_HOME}/apps/tethysapp-tethys_app_store && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/ggst && tethys install -w -N -q && cp install.yml && \
cd ${TETHYS_HOME}/apps/tethysapp-metdataexplorer && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/tethysapp-swe && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/tethysapp-hydrocompute && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/gwdm && tethys install -w -N -q && cp install.yml && \
cd ${TETHYS_HOME}/apps/snow-inspector && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/aquainsight && mv ${TETHYS_HOME}/apps/aquainsight/reactapp/config/development.env ${TETHYS_HOME}/apps/aquainsight/reactapp/config/production.env && npm install && npm run build && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/Tethys-CSES && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/hydroshare_api_tethysapp && tethys install -w -N -q && \
cd ${TETHYS_HOME}/apps/Water-Data-Explorer && tethys install -w -N -q && \
rm -rf /var/lib/apt/lists/* && \
find -name '*.a' -delete && \
rm -rf ${CONDA_HOME}/envs/${CONDA_ENV_NAME}/conda-meta && \
Expand All @@ -53,9 +53,6 @@ FROM tethysplatform/tethys-core:dev-py3.12-dj3.2 as build
COPY --chown=www:www --from=base ${CONDA_HOME}/envs/${CONDA_ENV_NAME} ${CONDA_HOME}/envs/${CONDA_ENV_NAME}
COPY config/tethys/asgi_supervisord.conf ${TETHYS_HOME}/asgi_supervisord.conf
COPY config/tethys/supervisord.conf /etc/supervisor/supervisord.conf
COPY config/tethys/update_tethys_apps.py ${TETHYS_HOME}
COPY config/tethys/update_proxy_apps.py ${TETHYS_HOME}
COPY config/tethys/update_state.sh ${TETHYS_HOME}
COPY config/tethys/gwdm/post_setup_gwdm.py ${TETHYS_HOME}

COPY salt/ /srv/salt/
Expand Down
265 changes: 0 additions & 265 deletions config/tethys/update_proxy_apps.py

This file was deleted.

Loading

0 comments on commit 2bd0e94

Please sign in to comment.