Merge pull request #207 from bird-house/fix-install-scripts

Minor fix to `install-docker.sh` and comment update for other scripts due to Magpie upgrade Found when trying to bring up the new production host for PAVICS. `install-docker.sh`: fix to work with users with sudo priviledge. Before it needed user `root`. Other comments in scripts are due to new Magpie in PR #107.
bird-house · Nov 3, 2021 · 08b25ce · 08b25ce
2 parents e895a7d + af75f20
commit 08b25ce
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.17.2
+current_version = 1.17.3
 commit = True
 tag = False
 tag_name = {new_version}

diff --git a/CHANGES.md b/CHANGES.md
@@ -16,6 +16,18 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.17.3](https://github.com/bird-house/birdhouse-deploy/tree/1.17.3) (2021-11-03)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+
+- Minor fix to `install-docker.sh` and comment update for other scripts due to Magpie upgrade
+
+  `install-docker.sh`: fix to work with users with sudo priviledge.  Before it needed user `root`.
+
+  Other comments in scripts are due to new Magpie in PR https://github.com/bird-house/birdhouse-deploy/pull/107.
+
+
 [1.17.2](https://github.com/bird-house/birdhouse-deploy/tree/1.17.2) (2021-11-03)
 ------------------------------------------------------------------------------------------------------------------
 

diff --git a/README.rst b/README.rst
@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.17.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.17.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.17.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.17.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.17.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.17.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.17.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.17.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

diff --git a/birdhouse/scripts/bootstrap-instance-for-testsuite b/birdhouse/scripts/bootstrap-instance-for-testsuite
@@ -14,16 +14,20 @@ THIS_DIR="`dirname "$THIS_FILE"`"
 
 set -x
 # Populate test .nc file on Thredds.
+# Need to open temporary Thredds "testdata/secure/" on PAVICS production to anonymous group.
+# Need write-access to DATASET_ROOT (/data/datasets/).
 $THIS_DIR/bootstrap-testdata
 
 # Index Thredds catalog.
+# Need to open temporary Thredds "testdata/secure/" on local PAVICS host to anonymous group.
 $THIS_DIR/trigger-pavicscrawler
 
 # For crawler to complete, assuming minimal dataset from bootstrap-testdata so
 # should be super fast to finish crawling.
 sleep 5
 
 # Create test user.
+# Need "optional-components/secure-thredds" activated to pre-create group thredds-secure-authtest-group.
 $THIS_DIR/create-magpie-authtest-user
 
 # Check if instance properly provisionned for testsuite.

diff --git a/birdhouse/scripts/bootstrap-testdata b/birdhouse/scripts/bootstrap-testdata
@@ -2,8 +2,12 @@
 # Bootstrap minimum test data on Thredds.
 # To run testsuite in https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests.
 #
+# Need to open temporary Thredds "testdata/secure/" on PAVICS production to anonymous group.
+#
 # To be run locally on the host running Thredds.  Will populate test data files
 # under DATASET_ROOT, customizable by env var.
+#
+# Need write-access to DATASET_ROOT (/data/datasets/).
 
 
 if [ -z "$DATASET_ROOT" ]; then

diff --git a/birdhouse/scripts/create-magpie-authtest-user b/birdhouse/scripts/create-magpie-authtest-user
@@ -2,6 +2,8 @@
 # Create authtest user for testsuite at
 # https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests.
 #
+# Need "optional-components/secure-thredds" activated to pre-create group thredds-secure-authtest-group.
+#
 # Options:
 #   -d: delete user 'authtest' instead of creating it
 

diff --git a/birdhouse/scripts/trigger-pavicscrawler b/birdhouse/scripts/trigger-pavicscrawler
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Trigger pavicscrawler on local PAVICS host.
 #
+# Need to open temporary Thredds "testdata/secure/" on local PAVICS host to anonymous group.
+#
 # pavicscrawler is a method of the catalog WPS service to index Thredds
 # catalog into Solr DB for quick searching.
 #

diff --git a/birdhouse/vagrant-utils/install-docker.sh b/birdhouse/vagrant-utils/install-docker.sh
@@ -90,7 +90,7 @@ fi
 
 # Add /usr/local/bin to PATH of all users, even root user, so docker-compose
 # can be found.
-echo 'export PATH="$PATH:/usr/local/bin"' > /etc/profile.d/usr_local_path.sh
+echo 'export PATH="$PATH:/usr/local/bin"' | sudo tee /etc/profile.d/usr_local_path.sh
 
 # install docker-compose, from https://gist.github.com/wdullaer/f1af16bd7e970389bad3
 LATEST_COMPOSE_VERSION="`git ls-remote https://github.com/docker/compose | grep refs/tags | grep -v refs/tags/v | grep -oP "[0-9]+\.[0-9][0-9]+\.[0-9]+$"|tail -1`"