diff --git a/ibdgc.datacommons.io/manifest.json b/ibdgc.datacommons.io/manifest.json index bc1489b100..7faab48119 100644 --- a/ibdgc.datacommons.io/manifest.json +++ b/ibdgc.datacommons.io/manifest.json @@ -4,24 +4,24 @@ "That's all I have to say" ], "versions": { - "arborist": "quay.io/cdis/arborist:2020.03", + "arborist": "quay.io/cdis/arborist:2020.04", "aws-es-proxy": "abutaha/aws-es-proxy:0.8", - "dashboard": "quay.io/cdis/gen3-statics:1.0.0", - "fence": "quay.io/cdis/fence:2020.03", - "indexd": "quay.io/cdis/indexd:2020.03", - "peregrine": "quay.io/cdis/peregrine:2020.03", - "pidgin": "quay.io/cdis/pidgin:2020.03", - "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1", - "sheepdog": "quay.io/cdis/sheepdog:2020.03", - "portal": "quay.io/cdis/data-portal:2.24.0", + "dashboard": "quay.io/cdis/gen3-statics:2020.04", + "fence": "quay.io/cdis/fence:2020.04", + "indexd": "quay.io/cdis/indexd:2020.04", + "peregrine": "quay.io/cdis/peregrine:2020.04", + "pidgin": "quay.io/cdis/pidgin:2020.04", + "revproxy": "quay.io/cdis/nginx:2020.04", + "sheepdog": "quay.io/cdis/sheepdog:2020.04", + "portal": "quay.io/cdis/data-portal:2020.04", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch", - "jupyterhub": "quay.io/occ_data/jupyterhub:master", - "spark": "quay.io/cdis/gen3-spark:2020.03", - "tube": "quay.io/cdis/tube:2020.03", - "hatchery": "quay.io/cdis/hatchery:2020.03", - "wts": "quay.io/cdis/workspace-token-service:2020.03", + "jupyterhub": "quay.io/occ_data/jupyterhub:2020.04", + "spark": "quay.io/cdis/gen3-spark:2020.04", + "tube": "quay.io/cdis/tube:2020.04", + "hatchery": "quay.io/cdis/hatchery:2020.04", + "wts": "quay.io/cdis/workspace-token-service:2020.04", "ambassador": "quay.io/datawire/ambassador:0.60.3", - "guppy": "quay.io/cdis/guppy:2020.03" + "guppy": "quay.io/cdis/guppy:2020.04" }, "indexd": { "arborist": "true" @@ -49,42 +49,70 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/gen3fuse-sidecar:chore_sidecar", - "env": {"NAMESPACE":"default", "HOSTNAME": "ibdgc.datacommons.io"}, + "image": "quay.io/cdis/gen3fuse-sidecar:2020.04", + "env": { + "NAMESPACE": "default", + "HOSTNAME": "ibdgc.datacommons.io" + }, "args": [], - "command": ["/bin/bash", "/sidecarDockerrun.sh"], - "lifecycle-pre-stop": ["su", "-c", "echo test", "-s", "/bin/sh", "root"] + "command": [ + "/bin/bash", + "/sidecarDockerrun.sh" + ], + "lifecycle-pre-stop": [ + "su", + "-c", + "echo test", + "-s", + "/bin/sh", + "root" + ] }, - "containers": [{ - "target-port": 8787, - "cpu-limit": "1.0", - "memory-limit": "1024Mi", - "name": "R Studio", - "image": "quay.io/cdis/rstudio:master", - "env": {"DISABLE_AUTH": "true"}, - "args": [], - "path-rewrite": "/", - "use-tls": "false", - "ready-probe": "/", - "user-volume-location": "/home/rstudio/pd", - "fs-gid": 100 - },{ - "target-port": 8888, - "cpu-limit": "1.0", - "memory-limit": "1024Mi", - "name": "Jupyter - Python/R", - "image": "quay.io/occ_data/jupyternotebook:1.7.2", - "env": {}, - "args": ["--NotebookApp.base_url=/lw-workspace/proxy/","--NotebookApp.password=''","--NotebookApp.token=''"], - "command": ["start-notebook.sh"], - "path-rewrite": "/lw-workspace/proxy/", - "use-tls": "false", - "ready-probe": "/lw-workspace/proxy/", - "lifecycle-post-start": ["/bin/sh","-c","export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true"], - "user-uid": 1000, - "fs-gid": 100, - "user-volume-location": "/home/jovyan/pd" - }] + "containers": [ + { + "target-port": 8787, + "cpu-limit": "1.0", + "memory-limit": "1024Mi", + "name": "R Studio", + "image": "quay.io/cdis/rstudio:master", + "env": { + "DISABLE_AUTH": "true" + }, + "args": [], + "path-rewrite": "/", + "use-tls": "false", + "ready-probe": "/", + "user-volume-location": "/home/rstudio/pd", + "fs-gid": 100 + }, + { + "target-port": 8888, + "cpu-limit": "1.0", + "memory-limit": "1024Mi", + "name": "Jupyter - Python/R", + "image": "quay.io/occ_data/jupyternotebook:1.7.2", + "env": {}, + "args": [ + "--NotebookApp.base_url=/lw-workspace/proxy/", + "--NotebookApp.password=''", + "--NotebookApp.token=''" + ], + "command": [ + "start-notebook.sh" + ], + "path-rewrite": "/lw-workspace/proxy/", + "use-tls": "false", + "ready-probe": "/lw-workspace/proxy/", + "lifecycle-post-start": [ + "/bin/sh", + "-c", + "export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; ln -s $(pwd) /home/$IAM/pd/dockerHome; mkdir -p /home/$IAM/.jupyter/custom; echo \"define(['base/js/namespace'], function(Jupyter){Jupyter._target = '_self';})\" >/home/$IAM/.jupyter/custom/custom.js; ln -s /data /home/$IAM/pd/; true" + ], + "user-uid": 1000, + "fs-gid": 100, + "user-volume-location": "/home/jovyan/pd" + } + ] }, "canary": { "default": 0 @@ -102,11 +130,11 @@ ], "config_index": "ibdgc_array-config", "auth_filter_field": "auth_resource_path" - }, - "arborist": { - "deployment_version": "2" - }, - "scaling": { + }, + "arborist": { + "deployment_version": "2" + }, + "scaling": { "arborist": { "strategy": "auto", "min": 2, @@ -156,4 +184,4 @@ "targetCpu": 40 } } -} +} \ No newline at end of file