Updates for Tethys 4

Dockerfile

@@ -1,4 +1,4 @@
-FROM tethysplatform/tethys-core:master
+FROM tethysplatform/tethys-core:latest
 
 ###############
 # ENVIRONMENT #
@@ -8,9 +8,13 @@ ENV DAM_INVENTORY_MAX_DAMS="50" \
     EARTH_ENGINE_SERVICE_ACCOUNT_EMAIL="" \
     THREDDS_TUTORIAL_TDS_USERNAME="admin" \
     THREDDS_TUTORIAL_TDS_PASSWORD="CHANGEME!" \
-    THREDDS_TUTORIAL_TDS_PROTOCOL="http" \
-    THREDDS_TUTORIAL_TDS_HOST="localhost" \
-    THREDDS_TUTORIAL_TDS_PORT="8080"
+    THREDDS_TUTORIAL_TDS_CATALOG="/thredds/catalog/catalog.xml" \
+    THREDDS_TUTORIAL_TDS_PRIVATE_PROTOCOL="http" \
+    THREDDS_TUTORIAL_TDS_PRIVATE_HOST="localhost" \
+    THREDDS_TUTORIAL_TDS_PRIVATE_PORT="8080" \
+    THREDDS_TUTORIAL_TDS_PUBLIC_PROTOCOL="http" \
+    THREDDS_TUTORIAL_TDS_PUBLIC_HOST="localhost" \
+    THREDDS_TUTORIAL_TDS_PUBLIC_PORT="8080"
 
 #############
 # ADD FILES #
@@ -29,26 +33,23 @@ COPY images/ /tmp/custom_theme/images/
 ###########
 # INSTALL #
 ###########
+# Activate tethys conda environment during build
+ARG MAMBA_DOCKERFILE_ACTIVATE=1
 # Bokeh App
-RUN /bin/bash -c "cd ${TETHYS_HOME}/apps/tethysapp-bokeh_tutorial && \
-    . ${CONDA_HOME}/bin/activate tethys && \
-    tethys install --no-db-sync"
+RUN cd ${TETHYS_HOME}/apps/tethysapp-bokeh_tutorial && \
+    tethys install --no-db-sync
 # Dam Inventory
-RUN /bin/bash -c "cd ${TETHYS_HOME}/apps/tethysapp-dam_inventory && \
-    . ${CONDA_HOME}/bin/activate tethys && \
-    tethys install --no-db-sync"
+RUN cd ${TETHYS_HOME}/apps/tethysapp-dam_inventory && \
+    tethys install --no-db-sync
 # Earth Engine
-RUN /bin/bash -c "cd ${TETHYS_HOME}/apps/tethysapp-earth_engine && \
-    . ${CONDA_HOME}/bin/activate tethys && \
-    tethys install --no-db-sync"
+RUN cd ${TETHYS_HOME}/apps/tethysapp-earth_engine && \
+    tethys install --no-db-sync
 # PostGIS App
-RUN /bin/bash -c "cd ${TETHYS_HOME}/apps/tethysapp-postgis_app && \
-    . ${CONDA_HOME}/bin/activate tethys && \
-    tethys install --no-db-sync"
+RUN cd ${TETHYS_HOME}/apps/tethysapp-postgis_app && \
+    tethys install --no-db-sync
 # THREDDS Tutorial
-RUN /bin/bash -c "cd ${TETHYS_HOME}/apps/tethysapp-thredds_tutorial && \
-    . ${CONDA_HOME}/bin/activate tethys && \
-    tethys install --no-db-sync"
+RUN cd ${TETHYS_HOME}/apps/tethysapp-thredds_tutorial && \
+    tethys install --no-db-sync
 
 ##################
 # ADD SALT FILES #
@@ -64,4 +65,4 @@ EXPOSE 80
 # RUN #
 #######
 WORKDIR ${TETHYS_HOME}
-CMD bash run.sh
+CMD bash run.sh

LICENSE

@@ -1,11 +1,7 @@
-Copyright 2021 Brigham Young University
+Copyright 2023 Tethys Platform
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -6,4 +6,4 @@ This repository demonstrates how to make a Docker image containing a custom Teth
 * [THREDDS Tutorial](https://github.com/tethysplatform/tethysapp-thredds_tutorial)
 * [Earth Engine](https://github.com/tethysplatform/tethysapp-earth_engine.git)
 * [PostGIS App](https://github.com/tethysplatform/tethysapp-postgis_app.git)
-* [Bokeh Tutorial](https://github.com/tethysplatform/tethysapp-bokeh_tutorial)
+* [Bokeh Tutorial](https://github.com/tethysplatform/tethysapp-bokeh_tutorial)

salt/init_apps.sls

@@ -1,5 +1,3 @@
-{% set CONDA_HOME = salt['environ.get']('CONDA_HOME') %}
-{% set TETHYS_HOME = salt['environ.get']('TETHYS_HOME') %}
 {% set TETHYS_PERSIST = salt['environ.get']('TETHYS_PERSIST') %}
 {% set DAM_INVENTORY_MAX_DAMS = salt['environ.get']('DAM_INVENTORY_MAX_DAMS') %}
 {% set EARTH_ENGINE_PRIVATE_KEY_FILE = salt['environ.get']('EARTH_ENGINE_PRIVATE_KEY_FILE') %}
@@ -9,16 +7,13 @@
 
 Sync_Apps:
   cmd.run:
-    - name: >
-        . {{ CONDA_HOME }}/bin/activate tethys &&
-        tethys db sync
+    - name: tethys db sync
     - shell: /bin/bash
     - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/init_apps_setup_complete" ];"
 
 Set_Custom_Settings:
   cmd.run:
     - name: >
-        . {{ CONDA_HOME }}/bin/activate tethys &&
         tethys app_settings set dam_inventory max_dams {{ DAM_INVENTORY_MAX_DAMS }} &&
         tethys app_settings set earth_engine service_account_email {{ EARTH_ENGINE_SERVICE_ACCOUNT_EMAIL }} &&
         tethys app_settings set earth_engine private_key_file {{ EARTH_ENGINE_PRIVATE_KEY_FILE }}
@@ -28,7 +23,6 @@ Set_Custom_Settings:
 Link_Tethys_Services_to_Apps:
   cmd.run:
     - name: >
-        . {{ CONDA_HOME }}/bin/activate tethys &&
         tethys link persistent:{{ POSTGIS_SERVICE_NAME }} dam_inventory:ps_database:primary_db &&
         tethys link persistent:{{ POSTGIS_SERVICE_NAME }} postgis_app:ps_database:flooded_addresses &&
         tethys link spatial:{{ THREDDS_SERVICE_NAME }} thredds_tutorial:ds_spatial:thredds_service
@@ -37,14 +31,12 @@ Link_Tethys_Services_to_Apps:
 
 Sync_App_Persistent_Stores:
   cmd.run:
-    - name: >
-        . {{ CONDA_HOME }}/bin/activate tethys &&
-        tethys syncstores all
+    - name: tethys syncstores all
     - shell: /bin/bash
     - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/init_apps_setup_complete" ];"
 
 Flag_Init_Apps_Setup_Complete:
   cmd.run:
     - name: touch {{ TETHYS_PERSIST }}/init_apps_setup_complete
     - shell: /bin/bash
-    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/init_apps_setup_complete" ];"
+    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/init_apps_setup_complete" ];"

salt/portal_theme.sls

@@ -1,4 +1,3 @@
-{% set CONDA_HOME = salt['environ.get']('CONDA_HOME') %}
 {% set TETHYS_PERSIST = salt['environ.get']('TETHYS_PERSIST') %}
 {% set STATIC_ROOT = salt['environ.get']('STATIC_ROOT') %}
 
@@ -11,22 +10,21 @@ Move_Custom_Theme_Files_to_Static_Root:
 Apply_Custom_Theme:
   cmd.run:
     - name: >
-        . {{ CONDA_HOME }}/bin/activate tethys &&
         tethys site
-        --title "My Custom Portal"
-        --tab-title "My Custom Portal"
-        --library-title "Tools"
+        --site-title "My Custom Portal"
+        --brand-text "My Custom Portal"
+        --apps-library-title "Tools"
         --primary-color "#01200F"
         --secondary-color "#358600"
         --background-color "#ffffff"
-        --logo "/custom_theme/images/leaf-logo.png"
+        --brand-image "/custom_theme/images/leaf-logo.png"
         --favicon "/custom_theme/images/favicon.ico"
-        --copyright "Copyright © 2021 My Organization"
+        --copyright "Copyright © 2023 My Organization"
     - shell: /bin/bash
     - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/custom_theme_setup_complete" ];"
 
 Flag_Custom_Theme_Setup_Complete:
   cmd.run:
     - name: touch {{ TETHYS_PERSIST }}/custom_theme_setup_complete
     - shell: /bin/bash
-    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/custom_theme_setup_complete" ];"
+    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/custom_theme_setup_complete" ];"

salt/tethys_services.sls

@@ -1,33 +1,37 @@
-{% set CONDA_HOME = salt['environ.get']('CONDA_HOME') %}
 {% set TETHYS_PERSIST = salt['environ.get']('TETHYS_PERSIST') %}
 {% set TETHYS_DB_HOST = salt['environ.get']('TETHYS_DB_HOST') %}
 {% set TETHYS_DB_PORT = salt['environ.get']('TETHYS_DB_PORT') %}
 {% set TETHYS_DB_SUPERUSER = salt['environ.get']('TETHYS_DB_SUPERUSER') %}
 {% set TETHYS_DB_SUPERUSER_PASS = salt['environ.get']('TETHYS_DB_SUPERUSER_PASS') %}
 {% set THREDDS_TUTORIAL_TDS_USERNAME = salt['environ.get']('THREDDS_TUTORIAL_TDS_USERNAME') %}
 {% set THREDDS_TUTORIAL_TDS_PASSWORD = salt['environ.get']('THREDDS_TUTORIAL_TDS_PASSWORD') %}
-{% set THREDDS_TUTORIAL_TDS_PROTOCOL = salt['environ.get']('THREDDS_TUTORIAL_TDS_PROTOCOL') %}
-{% set THREDDS_TUTORIAL_TDS_HOST = salt['environ.get']('THREDDS_TUTORIAL_TDS_HOST') %}
-{% set THREDDS_TUTORIAL_TDS_PORT = salt['environ.get']('THREDDS_TUTORIAL_TDS_PORT') %}
+{% set THREDDS_TUTORIAL_TDS_CATALOG = salt['environ.get']('THREDDS_TUTORIAL_TDS_CATALOG') %}
+{% set THREDDS_TUTORIAL_TDS_PRIVATE_PROTOCOL = salt['environ.get']('THREDDS_TUTORIAL_TDS_PRIVATE_PROTOCOL') %}
+{% set THREDDS_TUTORIAL_TDS_PRIVATE_HOST = salt['environ.get']('THREDDS_TUTORIAL_TDS_PRIVATE_HOST') %}
+{% set THREDDS_TUTORIAL_TDS_PRIVATE_PORT = salt['environ.get']('THREDDS_TUTORIAL_TDS_PRIVATE_PORT') %}
+{% set THREDDS_TUTORIAL_TDS_PUBLIC_PROTOCOL = salt['environ.get']('THREDDS_TUTORIAL_TDS_PUBLIC_PROTOCOL') %}
+{% set THREDDS_TUTORIAL_TDS_PUBLIC_HOST = salt['environ.get']('THREDDS_TUTORIAL_TDS_PUBLIC_HOST') %}
+{% set THREDDS_TUTORIAL_TDS_PUBLIC_PORT = salt['environ.get']('THREDDS_TUTORIAL_TDS_PUBLIC_PORT') %}
 {% set THREDDS_SERVICE_NAME = 'tethys_thredds' %}
 {% set POSTGIS_SERVICE_NAME = 'tethys_postgis' %}
-{% set THREDDS_SERVICE_URL = THREDDS_TUTORIAL_TDS_USERNAME + ':' + THREDDS_TUTORIAL_TDS_PASSWORD + '@' + THREDDS_TUTORIAL_TDS_PROTOCOL +'://' + THREDDS_TUTORIAL_TDS_HOST + ':' + THREDDS_TUTORIAL_TDS_PORT %}
+{% set THREDDS_SERVICE_PRIVATE_URL = THREDDS_TUTORIAL_TDS_USERNAME + ':' + THREDDS_TUTORIAL_TDS_PASSWORD + '@' + THREDDS_TUTORIAL_TDS_PRIVATE_PROTOCOL +'://' + THREDDS_TUTORIAL_TDS_PRIVATE_HOST + ':' + THREDDS_TUTORIAL_TDS_PRIVATE_PORT + THREDDS_TUTORIAL_TDS_CATALOG %}
+{% set THREDDS_SERVICE_PUBLIC_URL = THREDDS_TUTORIAL_TDS_PUBLIC_PROTOCOL +'://' + THREDDS_TUTORIAL_TDS_PUBLIC_HOST + ':' + THREDDS_TUTORIAL_TDS_PUBLIC_PORT + THREDDS_TUTORIAL_TDS_CATALOG %}
 {% set POSTGIS_SERVICE_URL = TETHYS_DB_SUPERUSER + ':' + TETHYS_DB_SUPERUSER_PASS + '@' + TETHYS_DB_HOST + ':' + TETHYS_DB_PORT %}
 
 Create_PostGIS_Database_Service:
   cmd.run:
-    - name: ". {{ CONDA_HOME }}/bin/activate tethys && tethys services create persistent -n {{ POSTGIS_SERVICE_NAME }} -c {{ POSTGIS_SERVICE_URL }}"
+    - name: "tethys services create persistent -n {{ POSTGIS_SERVICE_NAME }} -c {{ POSTGIS_SERVICE_URL }}"
     - shell: /bin/bash
     - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/tethys_services_complete" ];"
 
 Create_THREDDS_Spatial_Dataset_Service:
   cmd.run:
-    - name: ". {{ CONDA_HOME }}/bin/activate tethys && tethys services create spatial -t THREDDS -n {{ THREDDS_SERVICE_NAME }} -c {{ THREDDS_SERVICE_URL }}"
+    - name: "tethys services create spatial -t THREDDS -n {{ THREDDS_SERVICE_NAME }} -c {{ THREDDS_SERVICE_PRIVATE_URL }} -p {{ THREDDS_SERVICE_PUBLIC_URL }}"
     - shell: /bin/bash
     - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/tethys_services_complete" ];"
 
 Flag_Tethys_Services_Setup_Complete:
   cmd.run:
     - name: touch {{ TETHYS_PERSIST }}/tethys_services_complete
     - shell: /bin/bash
-    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/tethys_services_complete" ];"
+    - unless: /bin/bash -c "[ -f "{{ TETHYS_PERSIST }}/tethys_services_complete" ];"

salt/top.sls

@@ -5,4 +5,4 @@ base:
     - tethys_services
     - init_apps
     - portal_theme
-    - post_app
+    - post_app