Skip to content

Commit

Permalink
Merge pull request #4205 from uc-cdis/chore/apply_202202_to_accesscli…
Browse files Browse the repository at this point in the history 
…nicaldata_niaid_nih_gov_1645648314

Updating CI env with 2022.02 accessclinicaldata.niaid.nih.gov 1645648313
  • Loading branch information
@atharvar28
atharvar28 authored Feb 25, 2022
2 parents 429252f + 552ae2d commit f37c63e
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 65 deletions.
36 changes: 18 additions & 18 deletions accessclinicaldata.niaid.nih.gov/manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
"autodeploy": "yes"
},
"versions": {
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2021.09",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2021.09",
"arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2022.02",
"audit-service": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/audit-service:2022.02",
"aws-es-proxy": "quay.io/cdis/aws-es-proxy:0.8",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2021.09",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2021.09",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2021.09",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2021.09",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2021.09",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2021.09",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2021.09",
"dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2022.02",
"fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2022.02",
"indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2022.02",
"peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2022.02",
"pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2022.02",
"revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2022.02",
"sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2022.02",
"portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:3.19.3",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2021.09",
"tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2022.02",
"fluentd": "fluent/fluentd-kubernetes-daemonset:v1.2-debian-cloudwatch",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2021.09",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2021.09",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2021.09",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2021.09",
"spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2022.02",
"requestor": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/requestor:2022.02",
"hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2022.02",
"wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2022.02",
"ambassador": "quay.io/datawire/ambassador:1.4.2",
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2021.09",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2021.09",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2021.09"
"guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2022.02",
"ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2022.02",
"metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2022.02"
},
"arborist": {
"deployment_version": "2"
Expand All @@ -52,7 +52,7 @@
},
"ssjdispatcher": {
"job_images": {
"indexing": "quay.io/cdis/indexs3client:2021.09"
"indexing": "quay.io/cdis/indexs3client:2022.02"
}
},
"canary": {
Expand Down
94 changes: 47 additions & 47 deletions accessclinicaldata.niaid.nih.gov/manifests/hatchery/hatchery.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"sidecar": {
"cpu-limit": "1.0",
"memory-limit": "256Mi",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2021.09",
"image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2022.02",
"env": {
"NAMESPACE": "default",
"HOSTNAME": "accessclinicaldata.niaid.nih.gov"
Expand All @@ -25,51 +25,51 @@
]
},
"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": 8787,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "R Studio",
"image": "quay.io/cdis/rstudio:master",
"env": {
"DISABLE_AUTH": "true"
},
{
"target-port": 8888,
"cpu-limit": "1.0",
"memory-limit": "1024Mi",
"name": "Jupyter (Python 3.9.5, R 4.1.0)",
"image": "quay.io/cdis/jupyter-6.4.0-with-base-packages:latest",
"env": {
"NAMESPACE": "default",
"FRAME_ANCESTORS": "https://accessclinicaldata.niaid.nih.gov/"
},
"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"
}
"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 3.9.5, R 4.1.0)",
"image": "quay.io/cdis/jupyter-6.4.0-with-base-packages:latest",
"env": {
"NAMESPACE": "default",
"FRAME_ANCESTORS": "https://accessclinicaldata.niaid.nih.gov/"
},
"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"
}
]
}
}

0 comments on commit f37c63e

Please sign in to comment.