Merge pull request #8 from 4dn-dcic/jh_open_data

JH Open Data
4dn-dcic · Jul 14, 2021 · b57efda · b57efda
2 parents 73e4596 + 99e14c5
commit b57efda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -48,6 +48,7 @@ services:
       AWS_TEMPLATE_BUCKET: ${AWS_TEMPLATE_BUCKET}
       AWS_RAW_FILE_BUCKET: ${AWS_RAW_FILE_BUCKET}
       AWS_PROC_FILE_BUCKET: ${AWS_PROC_FILE_BUCKET}
+      AWS_OPEN_DATA_BUCKET: ${AWS_OPEN_DATA_BUCKET}
       FF_ACCESS_KEY: ""
       FF_ACCESS_SECRET: ""
       INIT_ERR_OUTPUT: ""

diff --git a/jupyterhub_config.py b/jupyterhub_config.py
@@ -198,10 +198,12 @@ def finalize_user_content(spawner):
 # notebook_mount_dir in form: '/path/on/host'
 notebook_mount_dir = '/home/ubuntu/data/jupyterhub-fourfront-notebooks/user-{username}'
 raw_data_mount_dir = '/home/ubuntu/data/' + os.environ['AWS_RAW_FILE_BUCKET']
+open_data_mount_dir = '/home/ubuntu/data/' + os.environ['AWS_OPEN_DATA_BUCKET']
 proc_data_mount_dir = '/home/ubuntu/data/' + os.environ['AWS_PROC_FILE_BUCKET']
 # notebook_dir in form: '/path/on/container'
 c.DockerSpawner.volumes = {notebook_mount_dir: {"bind": notebook_dir, "mode": "rw"},
                            raw_data_mount_dir: {"bind": '/home/jovyan/raw_data', "mode": "ro"},
+                           open_data_mount_dir: {"bind": '/home/jovyan/open_data', "mode": "ro"},
                            proc_data_mount_dir: {"bind": '/home/jovyan/proc_data', "mode": "ro"}}
 
 # allow escaped characters in volume names

diff --git a/supervisord.conf b/supervisord.conf
@@ -22,6 +22,12 @@ startsecs = 0
 autorestart = true
 startretries = 2
 
+[program:goofys5]
+command = /home/ubuntu/goofys-latest -o allow_other --file-mode 0444 --dir-mode 0111 -f %(ENV_AWS_OPEN_DATA_BUCKET)s /home/ubuntu/data/%(ENV_AWS_OPEN_DATA_BUCKET)s
+startsecs = 0
+autorestart = true
+startretries = 2
+
 [supervisord]
 logfile = /home/ubuntu/supervisor/supervisord.log
 pidfile = /home/ubuntu/supervisor/supervisord.pid