diff --git a/.github/workflows/dev_workflow.yml b/.github/workflows/dev_workflow.yml index 3467367..cee9c41 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} @@ -44,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: @@ -85,11 +132,13 @@ jobs: - tethysapp-tethys_app_store/** - tethysext-ciroh_theme/** - Water-Data-Explorer/** + - OWP/** - name: Set up Docker Buildx 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 }} @@ -146,6 +195,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 65c4dc2..a992515 100644 --- a/.github/workflows/prod_workflow.yml +++ b/.github/workflows/prod_workflow.yml @@ -17,6 +17,8 @@ on: - 'tethysapp-tethys_app_store/**' - 'tethysext-ciroh_theme/**' - 'Water-Data-Explorer/**' + - 'OWP/**' + env: DOCKER_HUB_ORG: gioelkin # DOCKER_HUB_ORG: ciroh @@ -112,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' 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..ea55fb2 --- /dev/null +++ b/OWP @@ -0,0 +1 @@ +Subproject commit ea55fb26881e33b4d379d894488cb0d9f049a6f4 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/prod_aws_values.yaml b/charts/ciroh/ci/prod_aws_values.yaml index ca2497a..e56f15b 100644 --- a/charts/ciroh/ci/prod_aws_values.yaml +++ b/charts/ciroh/ci/prod_aws_values.yaml @@ -161,8 +161,8 @@ tethys: djangocms: image: repository: gioelkin/django-cms - tag: dev_4e2d4deb320728e62b5534728f739287fcd4b669 - pullPolicy: 'IfNotPresent' + tag: latest + pullPolicy: 'Always' enabled: true ingress: enabled: false 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..0e6d781 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} @@ -35,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 && \ @@ -43,6 +45,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 && \