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
 
 #########
 # PORTS #
@@ -59,4 +60,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)