From 39f80dd2ceb2842f3c7ef191d074ba4db5fe3ad3 Mon Sep 17 00:00:00 2001 From: romer8 Date: Wed, 27 Sep 2023 12:52:35 -0600 Subject: [PATCH 01/11] added latest --- charts/ciroh/ci/prod_aws_values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ciroh/ci/prod_aws_values.yaml b/charts/ciroh/ci/prod_aws_values.yaml index ca2497a..9e6790f 100644 --- a/charts/ciroh/ci/prod_aws_values.yaml +++ b/charts/ciroh/ci/prod_aws_values.yaml @@ -161,7 +161,7 @@ tethys: djangocms: image: repository: gioelkin/django-cms - tag: dev_4e2d4deb320728e62b5534728f739287fcd4b669 + tag: latest pullPolicy: 'IfNotPresent' enabled: true ingress: From 074fc735815d89803dbf91b3d70969aeeb9b08a9 Mon Sep 17 00:00:00 2001 From: romer8 Date: Wed, 27 Sep 2023 13:16:49 -0600 Subject: [PATCH 02/11] added owp first version to repo --- .github/workflows/dev_workflow.yml | 2 ++ .github/workflows/prod_workflow.yml | 18 ++++++++++++++++++ .gitmodules | 4 ++++ OWP | 1 + README.md | 7 ++++--- charts/ciroh/ci/dev_aws_values.yaml | 2 +- charts/ciroh/ci/values-ci.yaml | 2 +- charts/ciroh/ci/values-dev.yaml | 2 +- piprequirements.txt | 5 ++++- prod.Dockerfile | 3 +++ 10 files changed, 39 insertions(+), 7 deletions(-) create mode 160000 OWP diff --git a/.github/workflows/dev_workflow.yml b/.github/workflows/dev_workflow.yml index 3467367..c1b0540 100644 --- a/.github/workflows/dev_workflow.yml +++ b/.github/workflows/dev_workflow.yml @@ -16,6 +16,7 @@ on: - 'tethysapp-tethys_app_store/**' - 'tethysext-ciroh_theme/**' - 'Water-Data-Explorer/**' + - 'OWP/**' pull_request: branches: - main @@ -31,6 +32,7 @@ on: - 'tethysapp-tethys_app_store/**' - 'tethysext-ciroh_theme/**' - 'Water-Data-Explorer/**' + - 'OWP/**' env: IMAGE_TAG: dev_${GITHUB_SHA} diff --git a/.github/workflows/prod_workflow.yml b/.github/workflows/prod_workflow.yml index 65c4dc2..38ca0b4 100644 --- a/.github/workflows/prod_workflow.yml +++ b/.github/workflows/prod_workflow.yml @@ -17,6 +17,24 @@ on: - 'tethysapp-tethys_app_store/**' - 'tethysext-ciroh_theme/**' - 'Water-Data-Explorer/**' + - 'OWP/**' + + pull_request: + branches: + - main + paths: + - 'charts/**' + - 'salt/**' + - 'config/**' + - '**.Dokerfile' + - 'snow-inspector/**' + - 'tethysapp-hydrocompute/**' + - 'tethysapp-metdataexplorer/**' + - 'tethysapp-swe/**' + - 'tethysapp-tethys_app_store/**' + - 'tethysext-ciroh_theme/**' + - 'Water-Data-Explorer/**' + - 'OWP/**' env: DOCKER_HUB_ORG: gioelkin # DOCKER_HUB_ORG: ciroh diff --git a/.gitmodules b/.gitmodules index 158dd0c..ddd3d0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = snow-inspector url = https://github.com/Aquaveo/snow-inspector branch = tethys4_upgrade +[submodule "OWP"] + path = OWP + url = git@github.com:Aquaveo/OWP.git + branch = main diff --git a/OWP b/OWP new file mode 160000 index 0000000..e496fb4 --- /dev/null +++ b/OWP @@ -0,0 +1 @@ +Subproject commit e496fb43d25303e448c7ddfb0484ebec0b2bad17 diff --git a/README.md b/README.md index a206cbe..fcfda7b 100644 --- a/README.md +++ b/README.md @@ -22,9 +22,10 @@ The portal contains native Tethys Platform and Proxy applications: 5. [Ground Water Mapper Application](https://github.com/Aquaveo/gwdm.git) (GWDM) 6. [Ground Subsseting Tool](https://github.com/Aquaveo/ggst.git) (GGST) 7. [Snow Inspector](https://github.com/BYU-Hydroinformatics/snow-inspector) -8. [OWP NWM Map Viewer](https://water.noaa.gov/map) (Proxy App) -9. [CIROH JupyterHub](https://jupyterhub.cuahsi.org/hub/login) (Proxy App) -10. [HydroShare](https://www.hydroshare.org/home/) (Proxy App) +8. [OWP Tethys App](https://github.com/Aquaveo/OWP) +9. [OWP NWM Map Viewer](https://water.noaa.gov/map) (Proxy App) +10. [CIROH JupyterHub](https://jupyterhub.cuahsi.org/hub/login) (Proxy App) +11. [HydroShare](https://www.hydroshare.org/home/) (Proxy App) ## Installation with Cloud Providers diff --git a/charts/ciroh/ci/dev_aws_values.yaml b/charts/ciroh/ci/dev_aws_values.yaml index 8476850..91aa10a 100644 --- a/charts/ciroh/ci/dev_aws_values.yaml +++ b/charts/ciroh/ci/dev_aws_values.yaml @@ -163,7 +163,7 @@ tethys: djangocms: image: repository: gioelkin/django-cms - tag: dev_4e2d4deb320728e62b5534728f739287fcd4b669 + tag: latest pullPolicy: 'IfNotPresent' enabled: true ingress: diff --git a/charts/ciroh/ci/values-ci.yaml b/charts/ciroh/ci/values-ci.yaml index cf98a9e..6825176 100644 --- a/charts/ciroh/ci/values-ci.yaml +++ b/charts/ciroh/ci/values-ci.yaml @@ -26,7 +26,7 @@ ingresses: djangocms: image: repository: gioelkin/django-cms - tag: dev_4e2d4deb320728e62b5534728f739287fcd4b669 + tag: latest enabled: false ingress: enabled: false diff --git a/charts/ciroh/ci/values-dev.yaml b/charts/ciroh/ci/values-dev.yaml index a883de7..21a54e4 100644 --- a/charts/ciroh/ci/values-dev.yaml +++ b/charts/ciroh/ci/values-dev.yaml @@ -28,7 +28,7 @@ ingresses: djangocms: image: repository: gioelkin/django-cms - tag: dev_4e2d4deb320728e62b5534728f739287fcd4b669 + tag: latest enabled: true ingress: enabled: false diff --git a/piprequirements.txt b/piprequirements.txt index e00c55f..05d6a5a 100644 --- a/piprequirements.txt +++ b/piprequirements.txt @@ -40,4 +40,7 @@ sphinx_rtd_theme sphinx sphinxcontrib-napoleon see -pypng \ No newline at end of file +pypng +httpx +nodejs +geoalchemy2 \ No newline at end of file diff --git a/prod.Dockerfile b/prod.Dockerfile index 2ebc3d2..381c3ea 100644 --- a/prod.Dockerfile +++ b/prod.Dockerfile @@ -12,6 +12,7 @@ COPY gwdm ${TETHYS_HOME}/apps/gwdm COPY tethysapp-swe ${TETHYS_HOME}/apps/tethysapp-swe COPY tethysapp-hydrocompute ${TETHYS_HOME}/apps/tethysapp-hydrocompute COPY snow-inspector ${TETHYS_HOME}/apps/snow-inspector +COPY OWP ${TETHYS_HOME}/apps/OWP COPY piprequirements.txt . COPY config/tethys/tmp_app_store_files/conda_install.sh ${TETHYS_HOME} @@ -43,6 +44,8 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ 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/OWP && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/OWP.yml && \ + rm -rf ${TETHYS_HOME}/extensions/* && \ rm -rf ${TETHYS_HOME}/apps/* && \ micromamba clean --all --yes && \ From 7929830d2cc8b3f1be189dd5dbf2ac8975d35fa1 Mon Sep 17 00:00:00 2001 From: romer8 Date: Wed, 27 Sep 2023 13:21:58 -0600 Subject: [PATCH 03/11] remove pull rquest --- .github/workflows/prod_workflow.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/prod_workflow.yml b/.github/workflows/prod_workflow.yml index 38ca0b4..694f81a 100644 --- a/.github/workflows/prod_workflow.yml +++ b/.github/workflows/prod_workflow.yml @@ -19,22 +19,6 @@ on: - 'Water-Data-Explorer/**' - 'OWP/**' - pull_request: - branches: - - main - paths: - - 'charts/**' - - 'salt/**' - - 'config/**' - - '**.Dokerfile' - - 'snow-inspector/**' - - 'tethysapp-hydrocompute/**' - - 'tethysapp-metdataexplorer/**' - - 'tethysapp-swe/**' - - 'tethysapp-tethys_app_store/**' - - 'tethysext-ciroh_theme/**' - - 'Water-Data-Explorer/**' - - 'OWP/**' env: DOCKER_HUB_ORG: gioelkin # DOCKER_HUB_ORG: ciroh From eebade97585f9aa03c8e551dd63bde50cd37bc82 Mon Sep 17 00:00:00 2001 From: romer8 Date: Wed, 27 Sep 2023 13:26:32 -0600 Subject: [PATCH 04/11] changed a couple of things in workflows --- .github/workflows/dev_workflow.yml | 47 +++++++++++++++++++++++++++++ .github/workflows/prod_workflow.yml | 1 + 2 files changed, 48 insertions(+) diff --git a/.github/workflows/dev_workflow.yml b/.github/workflows/dev_workflow.yml index c1b0540..04e1e86 100644 --- a/.github/workflows/dev_workflow.yml +++ b/.github/workflows/dev_workflow.yml @@ -46,6 +46,51 @@ jobs: runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: Free disk space + run: | + sudo docker rmi $(docker image ls -aq) || true + sudo swapoff /mnt/swapfile || true + sudo rm -rf /mnt/swapfile /usr/share/dotnet /usr/local/lib/android /opt/ghc || true + sudo apt purge aria2 ansible azure-cli shellcheck rpm xorriso zsync \ + clang-6.0 lldb-6.0 lld-6.0 clang-format-6.0 clang-8 lldb-8 lld-8 clang-format-8 \ + clang-9 lldb-9 lld-9 clangd-9 clang-format-9 dotnet-sdk-3.0 dotnet-sdk-3.1=3.1.101-1 \ + esl-erlang firefox g++-8 g++-9 gfortran-8 gfortran-9 google-chrome-stable \ + google-cloud-sdk ghc-8.0.2 ghc-8.2.2 ghc-8.4.4 ghc-8.6.2 ghc-8.6.3 ghc-8.6.4 \ + ghc-8.6.5 ghc-8.8.1 ghc-8.8.2 ghc-8.8.3 ghc-8.10.1 cabal-install-2.0 cabal-install-2.2 \ + cabal-install-2.4 cabal-install-3.0 cabal-install-3.2 heroku imagemagick \ + libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl \ + mercurial apt-transport-https mono-complete mysql-client libmysqlclient-dev \ + mysql-server mssql-tools unixodbc-dev yarn bazel chrpath libssl-dev libxft-dev \ + libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev php7.1 php7.1-bcmath \ + php7.1-bz2 php7.1-cgi php7.1-cli php7.1-common php7.1-curl php7.1-dba php7.1-dev \ + php7.1-enchant php7.1-fpm php7.1-gd php7.1-gmp php7.1-imap php7.1-interbase php7.1-intl \ + php7.1-json php7.1-ldap php7.1-mbstring php7.1-mcrypt php7.1-mysql php7.1-odbc \ + php7.1-opcache php7.1-pgsql php7.1-phpdbg php7.1-pspell php7.1-readline php7.1-recode \ + php7.1-snmp php7.1-soap php7.1-sqlite3 php7.1-sybase php7.1-tidy php7.1-xml \ + php7.1-xmlrpc php7.1-xsl php7.1-zip php7.2 php7.2-bcmath php7.2-bz2 php7.2-cgi \ + php7.2-cli php7.2-common php7.2-curl php7.2-dba php7.2-dev php7.2-enchant php7.2-fpm \ + php7.2-gd php7.2-gmp php7.2-imap php7.2-interbase php7.2-intl php7.2-json php7.2-ldap \ + php7.2-mbstring php7.2-mysql php7.2-odbc php7.2-opcache php7.2-pgsql php7.2-phpdbg \ + php7.2-pspell php7.2-readline php7.2-recode php7.2-snmp php7.2-soap php7.2-sqlite3 \ + php7.2-sybase php7.2-tidy php7.2-xml php7.2-xmlrpc php7.2-xsl php7.2-zip php7.3 \ + php7.3-bcmath php7.3-bz2 php7.3-cgi php7.3-cli php7.3-common php7.3-curl php7.3-dba \ + php7.3-dev php7.3-enchant php7.3-fpm php7.3-gd php7.3-gmp php7.3-imap php7.3-interbase \ + php7.3-intl php7.3-json php7.3-ldap php7.3-mbstring php7.3-mysql php7.3-odbc \ + php7.3-opcache php7.3-pgsql php7.3-phpdbg php7.3-pspell php7.3-readline php7.3-recode \ + php7.3-snmp php7.3-soap php7.3-sqlite3 php7.3-sybase php7.3-tidy php7.3-xml \ + php7.3-xmlrpc php7.3-xsl php7.3-zip php7.4 php7.4-bcmath php7.4-bz2 php7.4-cgi \ + php7.4-cli php7.4-common php7.4-curl php7.4-dba php7.4-dev php7.4-enchant php7.4-fpm \ + php7.4-gd php7.4-gmp php7.4-imap php7.4-interbase php7.4-intl php7.4-json php7.4-ldap \ + php7.4-mbstring php7.4-mysql php7.4-odbc php7.4-opcache php7.4-pgsql php7.4-phpdbg \ + php7.4-pspell php7.4-readline php7.4-snmp php7.4-soap php7.4-sqlite3 php7.4-sybase \ + php7.4-tidy php7.4-xml php7.4-xmlrpc php7.4-xsl php7.4-zip php-amqp php-apcu \ + php-igbinary php-memcache php-memcached php-mongodb php-redis php-xdebug \ + php-zmq snmp pollinate libpq-dev postgresql-client powershell ruby-full \ + sphinxsearch subversion mongodb-org -yq >/dev/null 2>&1 || true + sudo apt-get autoremove -y >/dev/null 2>&1 || true + sudo apt-get autoclean -y >/dev/null 2>&1 || true + - name: Check disk space + run: df -h # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 with: @@ -87,6 +132,7 @@ jobs: - tethysapp-tethys_app_store/** - tethysext-ciroh_theme/** - Water-Data-Explorer/** + - OWP/** - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -148,6 +194,7 @@ jobs: - tethysapp-tethys_app_store/** - tethysext-ciroh_theme/** - Water-Data-Explorer/** + - OWP/** - name: Docker login if: steps.changed-files-yaml.outputs.docker_any_changed == 'true' diff --git a/.github/workflows/prod_workflow.yml b/.github/workflows/prod_workflow.yml index 694f81a..a992515 100644 --- a/.github/workflows/prod_workflow.yml +++ b/.github/workflows/prod_workflow.yml @@ -114,6 +114,7 @@ jobs: - tethysapp-tethys_app_store/** - tethysext-ciroh_theme/** - Water-Data-Explorer/** + - OWP/** - name: Set up Docker Buildx if: steps.changed-files-yaml.outputs.docker_any_changed == 'true' From 9a9f571a5cb582c822895ef612da023b59896601 Mon Sep 17 00:00:00 2001 From: romer8 Date: Wed, 27 Sep 2023 15:34:07 -0600 Subject: [PATCH 05/11] added to build owp static --- OWP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWP b/OWP index e496fb4..3d456f9 160000 --- a/OWP +++ b/OWP @@ -1 +1 @@ -Subproject commit e496fb43d25303e448c7ddfb0484ebec0b2bad17 +Subproject commit 3d456f9148473b121ab055067ec068eb302736f6 From 8865fb6f5dac7eb9cf1b1513a9e171a55eb20178 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 13:53:12 -0600 Subject: [PATCH 06/11] added final details --- OWP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWP b/OWP index 3d456f9..4fe0d42 160000 --- a/OWP +++ b/OWP @@ -1 +1 @@ -Subproject commit 3d456f9148473b121ab055067ec068eb302736f6 +Subproject commit 4fe0d42e0407532e226c66eafce6ce9462366b0c From 0b38481ebb457e191b094daf021d3a4d7ed214c4 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 13:57:25 -0600 Subject: [PATCH 07/11] added change for ciroh portal --- OWP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWP b/OWP index 4fe0d42..89fbca5 160000 --- a/OWP +++ b/OWP @@ -1 +1 @@ -Subproject commit 4fe0d42e0407532e226c66eafce6ce9462366b0c +Subproject commit 89fbca5cfc6c6b4da0e3363b769a03629087f680 From f449484f7284c9cf7ae67c7ecfb4f4c283e92182 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 15:07:11 -0600 Subject: [PATCH 08/11] added more changes --- charts/ciroh/ci/prod_aws_values.yaml | 2 +- prod.Dockerfile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/ciroh/ci/prod_aws_values.yaml b/charts/ciroh/ci/prod_aws_values.yaml index 9e6790f..e56f15b 100644 --- a/charts/ciroh/ci/prod_aws_values.yaml +++ b/charts/ciroh/ci/prod_aws_values.yaml @@ -162,7 +162,7 @@ djangocms: image: repository: gioelkin/django-cms tag: latest - pullPolicy: 'IfNotPresent' + pullPolicy: 'Always' enabled: true ingress: enabled: false diff --git a/prod.Dockerfile b/prod.Dockerfile index 381c3ea..e2b1cc0 100644 --- a/prod.Dockerfile +++ b/prod.Dockerfile @@ -26,7 +26,6 @@ ADD tethysext-ciroh_theme/*.py ${TETHYS_HOME}/extensions/tethysext-ciroh_theme/ # Activate tethys conda environment during build ARG MAMBA_DOCKERFILE_ACTIVATE=1 - ####################################### # INSTALL EXTENSIONS and APPLICATIONS # ####################################### @@ -45,7 +44,6 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ 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/OWP && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/OWP.yml && \ - rm -rf ${TETHYS_HOME}/extensions/* && \ rm -rf ${TETHYS_HOME}/apps/* && \ micromamba clean --all --yes && \ From 900626da12abb0b29fafdaa6eff8df463d2f2744 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 15:16:24 -0600 Subject: [PATCH 09/11] trigger again --- .github/workflows/dev_workflow.yml | 1 + prod.Dockerfile | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/dev_workflow.yml b/.github/workflows/dev_workflow.yml index 04e1e86..cee9c41 100644 --- a/.github/workflows/dev_workflow.yml +++ b/.github/workflows/dev_workflow.yml @@ -138,6 +138,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v2 + if: steps.changed-files-yaml.outputs.docker_any_changed == 'true' with: username: ${{ secrets.DOCKER_BUILDER_USERNAME }} password: ${{ secrets.DOCKER_BUILDER_TOKEN }} diff --git a/prod.Dockerfile b/prod.Dockerfile index e2b1cc0..5808bfc 100644 --- a/prod.Dockerfile +++ b/prod.Dockerfile @@ -30,8 +30,11 @@ ARG MAMBA_DOCKERFILE_ACTIVATE=1 # INSTALL EXTENSIONS and APPLICATIONS # ####################################### RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ + micromamba install --yes -c conda-forge geoserver-rest && \ + conda install --yes -c conda-forge udunits2 && \ + # micromamba install --yes -c conda-forge --file requirements.txt --> problem installing with microbamba, but pip is working well but unstable 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 && \ @@ -47,6 +50,7 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ rm -rf ${TETHYS_HOME}/extensions/* && \ rm -rf ${TETHYS_HOME}/apps/* && \ micromamba clean --all --yes && \ + conda clean --all --yes && \ rm -rf /var/lib/apt/lists/* && \ find -name '*.a' -delete && \ From 4a25d1b83b6f3f39b0ae60131fbfb279031008f4 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 15:30:52 -0600 Subject: [PATCH 10/11] push some changes --- prod.Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/prod.Dockerfile b/prod.Dockerfile index 5808bfc..381c3ea 100644 --- a/prod.Dockerfile +++ b/prod.Dockerfile @@ -26,15 +26,13 @@ ADD tethysext-ciroh_theme/*.py ${TETHYS_HOME}/extensions/tethysext-ciroh_theme/ # Activate tethys conda environment during build ARG MAMBA_DOCKERFILE_ACTIVATE=1 + ####################################### # INSTALL EXTENSIONS and APPLICATIONS # ####################################### RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ - micromamba install --yes -c conda-forge geoserver-rest && \ - conda install --yes -c conda-forge udunits2 && \ - # micromamba install --yes -c conda-forge --file requirements.txt --> problem installing with microbamba, but pip is working well but unstable 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 && \ @@ -47,10 +45,10 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ 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/OWP && tethys install -w -N -q && cp install.yml $PYTHON_SITE_PACKAGE_PATH/site-packages/OWP.yml && \ + rm -rf ${TETHYS_HOME}/extensions/* && \ rm -rf ${TETHYS_HOME}/apps/* && \ micromamba clean --all --yes && \ - conda clean --all --yes && \ rm -rf /var/lib/apt/lists/* && \ find -name '*.a' -delete && \ From c4dd3040f294af5f40244f83432d18de089626e4 Mon Sep 17 00:00:00 2001 From: romer8 Date: Thu, 28 Sep 2023 16:57:05 -0600 Subject: [PATCH 11/11] commited for websockets --- OWP | 2 +- prod.Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OWP b/OWP index 89fbca5..ea55fb2 160000 --- a/OWP +++ b/OWP @@ -1 +1 @@ -Subproject commit 89fbca5cfc6c6b4da0e3363b769a03629087f680 +Subproject commit ea55fb26881e33b4d379d894488cb0d9f049a6f4 diff --git a/prod.Dockerfile b/prod.Dockerfile index 381c3ea..0e6d781 100644 --- a/prod.Dockerfile +++ b/prod.Dockerfile @@ -36,6 +36,7 @@ RUN pip install --no-cache-dir --quiet -r piprequirements.txt && \ # micromamba install --yes -c conda-forge --file requirements.txt --> problem installing with microbamba, but pip is working well but unstable 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/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 && 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 && \