{"action":"created","comment":{"url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/comments/121600654","pull_request_review_id":43639111,"id":121600654,"diff_hunk":"@@ -1,17 +1,112 @@\n-FROM jupyter/scipy-notebook:latest\n+FROM jupyter/datascience-notebook:latest\n MAINTAINER ome-devel@lists.openmicroscopy.org.uk\n \n USER root\n+\n+## Swap the name of NB_USER\n+RUN usermod -l omero $NB_USER && \\\n+    ln -s /home/$NB_USER /home/omero && \\\n+    mkdir -p /home/omero/data && \\\n+    chown omero /home/omero/data && \\\n+    chmod a+X /home/omero\n+ENV NB_USER omero\n+# Note: this replaces \"OMERO_DATA_DIR=/home/omero/data bash -eux step02_all_setup.sh\"\n+\n RUN apt-get update -y && \\\n-    apt-get install -y nodejs\n+    apt-get install -y nodejs wget git\n+\n+## Install R tools\n+RUN pip install notedown\n+RUN conda config --add channels bioconda && \\\n+    conda install --quiet --yes \\\n+    'r-mclust' \\\n+    'r-ggdendro' \\\n+    'r-igraph' \\\n+    'r-pheatmap'\n+\n+\n+# FROM rOMERO-gateway/Dockerfile\n+# ##############################\n+# ##############################\n+\n+# Dependencies necessary for install.R\n+RUN echo \"deb-src http://deb.debian.org/debian testing main\" >> /etc/apt/sources.list\n+RUN echo \"deb http://ftp.debian.org/debian jessie-backports main\" >> /etc/apt/sources.list\n+RUN apt-get update && \\\n+    apt-get -y install libssl-dev libxml2-dev libcurl4-openssl-dev\n+\n+#########################################################################################\n+## Necessary for running maven\n+## copied from https://hub.docker.com/r/cardcorp/r-java/~/dockerfile/\n+##\n+## gnupg is needed to add new key\n+RUN apt-get update && apt-get install -y gnupg2\n+\n+## Install Java \n+RUN apt-get update \\\n+    && apt-get install -t jessie-backports -y openjdk-8-jdk \\\n+    && echo \"MAVEN IS NOT IN THE UPSTREAM LIST (JOSH)\" \\\n+    && apt-get install -y maven \\ \n+    && rm -rf /var/lib/apt/lists/* \\\n+    && apt-get clean \n \n-RUN install -o jovyan -g users -d /notebooks /opt/omero\n+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64\n+RUN rm -rf /usr/lib/jvm/java\n+RUN ln -s  /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java\n+RUN R CMD javareconf\n+    \n+## make sure Java can be found in rApache and other daemons not looking in R ldpaths\n+RUN echo \"/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/\" > /etc/ld.so.conf.d/rJava.conf\n+RUN /sbin/ldconfig\n \n-USER jovyan\n+###\n+### Fix install2.r\n+### --------------\n+### See https://github.com/rocker-org/rocker/blob/e9758030e435915d5e6f21aaab0fc35a5a8efaae/r-base/Dockerfile#L41\n+### https://github.com/rocker-org/rocker/issues/149\n+### --------------\n+## Now install R and littler, and create a link for littler in /usr/local/bin\n+## Also set a default CRAN repo, and make sure littler knows about it too\n+RUN apt-get update \\\n+        && echo \"MIGRATE THIS BLOCK TO THE APT-GET ABOVE\" \\","path":"Dockerfile","position":75,"original_position":75,"commit_id":"f8fad70ef9fc040ab96a56f1f02d104f3ef43042","original_commit_id":"f8fad70ef9fc040ab96a56f1f02d104f3ef43042","user":{"login":"joshmoore","id":88113,"avatar_url":"https://avatars1.githubusercontent.com/u/88113?v=3","gravatar_id":"","url":"https://api.github.com/users/joshmoore","html_url":"https://github.com/joshmoore","followers_url":"https://api.github.com/users/joshmoore/followers","following_url":"https://api.github.com/users/joshmoore/following{/other_user}","gists_url":"https://api.github.com/users/joshmoore/gists{/gist_id}","starred_url":"https://api.github.com/users/joshmoore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joshmoore/subscriptions","organizations_url":"https://api.github.com/users/joshmoore/orgs","repos_url":"https://api.github.com/users/joshmoore/repos","events_url":"https://api.github.com/users/joshmoore/events{/privacy}","received_events_url":"https://api.github.com/users/joshmoore/received_events","type":"User","site_admin":false},"body":"It means that things need squashing; will handle that with other squashing.","created_at":"2017-06-13T07:27:55Z","updated_at":"2017-06-13T07:27:55Z","html_url":"https://github.com/IDR/jupyter-docker/pull/8#discussion_r121600654","pull_request_url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8","_links":{"self":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/comments/121600654"},"html":{"href":"https://github.com/IDR/jupyter-docker/pull/8#discussion_r121600654"},"pull_request":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8"}}},"pull_request":{"url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8","id":120149782,"html_url":"https://github.com/IDR/jupyter-docker/pull/8","diff_url":"https://github.com/IDR/jupyter-docker/pull/8.diff","patch_url":"https://github.com/IDR/jupyter-docker/pull/8.patch","issue_url":"https://api.github.com/repos/IDR/jupyter-docker/issues/8","number":8,"state":"open","locked":false,"title":"040 update","user":{"login":"joshmoore","id":88113,"avatar_url":"https://avatars1.githubusercontent.com/u/88113?v=3","gravatar_id":"","url":"https://api.github.com/users/joshmoore","html_url":"https://github.com/joshmoore","followers_url":"https://api.github.com/users/joshmoore/followers","following_url":"https://api.github.com/users/joshmoore/following{/other_user}","gists_url":"https://api.github.com/users/joshmoore/gists{/gist_id}","starred_url":"https://api.github.com/users/joshmoore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joshmoore/subscriptions","organizations_url":"https://api.github.com/users/joshmoore/orgs","repos_url":"https://api.github.com/users/joshmoore/repos","events_url":"https://api.github.com/users/joshmoore/events{/privacy}","received_events_url":"https://api.github.com/users/joshmoore/received_events","type":"User","site_admin":false},"body":"Combine:\r\n\r\n * @bramalingam's TrialBranch\r\n * and my datascience branch\r\n\r\nto enable R in Jupyter. Deployed on minke.\r\n\r\nTODO:\r\n * [ ] https://github.com/ome/rOMERO-gateway/pull/19","created_at":"2017-05-11T16:31:49Z","updated_at":"2017-06-13T07:27:55Z","closed_at":null,"merged_at":null,"merge_commit_sha":"5795d14db3661b642a23ee08ac85e16192447fe3","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8/commits","review_comments_url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8/comments","review_comment_url":"https://api.github.com/repos/IDR/jupyter-docker/pulls/comments{/number}","comments_url":"https://api.github.com/repos/IDR/jupyter-docker/issues/8/comments","statuses_url":"https://api.github.com/repos/IDR/jupyter-docker/statuses/f8fad70ef9fc040ab96a56f1f02d104f3ef43042","head":{"label":"joshmoore:040-update","ref":"040-update","sha":"f8fad70ef9fc040ab96a56f1f02d104f3ef43042","user":{"login":"joshmoore","id":88113,"avatar_url":"https://avatars1.githubusercontent.com/u/88113?v=3","gravatar_id":"","url":"https://api.github.com/users/joshmoore","html_url":"https://github.com/joshmoore","followers_url":"https://api.github.com/users/joshmoore/followers","following_url":"https://api.github.com/users/joshmoore/following{/other_user}","gists_url":"https://api.github.com/users/joshmoore/gists{/gist_id}","starred_url":"https://api.github.com/users/joshmoore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joshmoore/subscriptions","organizations_url":"https://api.github.com/users/joshmoore/orgs","repos_url":"https://api.github.com/users/joshmoore/repos","events_url":"https://api.github.com/users/joshmoore/events{/privacy}","received_events_url":"https://api.github.com/users/joshmoore/received_events","type":"User","site_admin":false},"repo":{"id":69940803,"name":"jupyter-docker","full_name":"joshmoore/jupyter-docker","owner":{"login":"joshmoore","id":88113,"avatar_url":"https://avatars1.githubusercontent.com/u/88113?v=3","gravatar_id":"","url":"https://api.github.com/users/joshmoore","html_url":"https://github.com/joshmoore","followers_url":"https://api.github.com/users/joshmoore/followers","following_url":"https://api.github.com/users/joshmoore/following{/other_user}","gists_url":"https://api.github.com/users/joshmoore/gists{/gist_id}","starred_url":"https://api.github.com/users/joshmoore/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/joshmoore/subscriptions","organizations_url":"https://api.github.com/users/joshmoore/orgs","repos_url":"https://api.github.com/users/joshmoore/repos","events_url":"https://api.github.com/users/joshmoore/events{/privacy}","received_events_url":"https://api.github.com/users/joshmoore/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/joshmoore/jupyter-docker","description":null,"fork":true,"url":"https://api.github.com/repos/joshmoore/jupyter-docker","forks_url":"https://api.github.com/repos/joshmoore/jupyter-docker/forks","keys_url":"https://api.github.com/repos/joshmoore/jupyter-docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/joshmoore/jupyter-docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/joshmoore/jupyter-docker/teams","hooks_url":"https://api.github.com/repos/joshmoore/jupyter-docker/hooks","issue_events_url":"https://api.github.com/repos/joshmoore/jupyter-docker/issues/events{/number}","events_url":"https://api.github.com/repos/joshmoore/jupyter-docker/events","assignees_url":"https://api.github.com/repos/joshmoore/jupyter-docker/assignees{/user}","branches_url":"https://api.github.com/repos/joshmoore/jupyter-docker/branches{/branch}","tags_url":"https://api.github.com/repos/joshmoore/jupyter-docker/tags","blobs_url":"https://api.github.com/repos/joshmoore/jupyter-docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/joshmoore/jupyter-docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/joshmoore/jupyter-docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/joshmoore/jupyter-docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/joshmoore/jupyter-docker/statuses/{sha}","languages_url":"https://api.github.com/repos/joshmoore/jupyter-docker/languages","stargazers_url":"https://api.github.com/repos/joshmoore/jupyter-docker/stargazers","contributors_url":"https://api.github.com/repos/joshmoore/jupyter-docker/contributors","subscribers_url":"https://api.github.com/repos/joshmoore/jupyter-docker/subscribers","subscription_url":"https://api.github.com/repos/joshmoore/jupyter-docker/subscription","commits_url":"https://api.github.com/repos/joshmoore/jupyter-docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/joshmoore/jupyter-docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/joshmoore/jupyter-docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/joshmoore/jupyter-docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/joshmoore/jupyter-docker/contents/{+path}","compare_url":"https://api.github.com/repos/joshmoore/jupyter-docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/joshmoore/jupyter-docker/merges","archive_url":"https://api.github.com/repos/joshmoore/jupyter-docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/joshmoore/jupyter-docker/downloads","issues_url":"https://api.github.com/repos/joshmoore/jupyter-docker/issues{/number}","pulls_url":"https://api.github.com/repos/joshmoore/jupyter-docker/pulls{/number}","milestones_url":"https://api.github.com/repos/joshmoore/jupyter-docker/milestones{/number}","notifications_url":"https://api.github.com/repos/joshmoore/jupyter-docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/joshmoore/jupyter-docker/labels{/name}","releases_url":"https://api.github.com/repos/joshmoore/jupyter-docker/releases{/id}","deployments_url":"https://api.github.com/repos/joshmoore/jupyter-docker/deployments","created_at":"2016-10-04T06:53:50Z","updated_at":"2016-10-04T06:53:50Z","pushed_at":"2017-05-30T15:21:01Z","git_url":"git://github.com/joshmoore/jupyter-docker.git","ssh_url":"git@github.com:joshmoore/jupyter-docker.git","clone_url":"https://github.com/joshmoore/jupyter-docker.git","svn_url":"https://github.com/joshmoore/jupyter-docker","homepage":null,"size":19,"stargazers_count":0,"watchers_count":0,"language":"Shell","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"IDR:master","ref":"master","sha":"d14a21c52a3755eac8def8ff65299e5dad25f0f9","user":{"login":"IDR","id":16244820,"avatar_url":"https://avatars0.githubusercontent.com/u/16244820?v=3","gravatar_id":"","url":"https://api.github.com/users/IDR","html_url":"https://github.com/IDR","followers_url":"https://api.github.com/users/IDR/followers","following_url":"https://api.github.com/users/IDR/following{/other_user}","gists_url":"https://api.github.com/users/IDR/gists{/gist_id}","starred_url":"https://api.github.com/users/IDR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IDR/subscriptions","organizations_url":"https://api.github.com/users/IDR/orgs","repos_url":"https://api.github.com/users/IDR/repos","events_url":"https://api.github.com/users/IDR/events{/privacy}","received_events_url":"https://api.github.com/users/IDR/received_events","type":"Organization","site_admin":false},"repo":{"id":62728942,"name":"jupyter-docker","full_name":"IDR/jupyter-docker","owner":{"login":"IDR","id":16244820,"avatar_url":"https://avatars0.githubusercontent.com/u/16244820?v=3","gravatar_id":"","url":"https://api.github.com/users/IDR","html_url":"https://github.com/IDR","followers_url":"https://api.github.com/users/IDR/followers","following_url":"https://api.github.com/users/IDR/following{/other_user}","gists_url":"https://api.github.com/users/IDR/gists{/gist_id}","starred_url":"https://api.github.com/users/IDR/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/IDR/subscriptions","organizations_url":"https://api.github.com/users/IDR/orgs","repos_url":"https://api.github.com/users/IDR/repos","events_url":"https://api.github.com/users/IDR/events{/privacy}","received_events_url":"https://api.github.com/users/IDR/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/IDR/jupyter-docker","description":null,"fork":false,"url":"https://api.github.com/repos/IDR/jupyter-docker","forks_url":"https://api.github.com/repos/IDR/jupyter-docker/forks","keys_url":"https://api.github.com/repos/IDR/jupyter-docker/keys{/key_id}","collaborators_url":"https://api.github.com/repos/IDR/jupyter-docker/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/IDR/jupyter-docker/teams","hooks_url":"https://api.github.com/repos/IDR/jupyter-docker/hooks","issue_events_url":"https://api.github.com/repos/IDR/jupyter-docker/issues/events{/number}","events_url":"https://api.github.com/repos/IDR/jupyter-docker/events","assignees_url":"https://api.github.com/repos/IDR/jupyter-docker/assignees{/user}","branches_url":"https://api.github.com/repos/IDR/jupyter-docker/branches{/branch}","tags_url":"https://api.github.com/repos/IDR/jupyter-docker/tags","blobs_url":"https://api.github.com/repos/IDR/jupyter-docker/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/IDR/jupyter-docker/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/IDR/jupyter-docker/git/refs{/sha}","trees_url":"https://api.github.com/repos/IDR/jupyter-docker/git/trees{/sha}","statuses_url":"https://api.github.com/repos/IDR/jupyter-docker/statuses/{sha}","languages_url":"https://api.github.com/repos/IDR/jupyter-docker/languages","stargazers_url":"https://api.github.com/repos/IDR/jupyter-docker/stargazers","contributors_url":"https://api.github.com/repos/IDR/jupyter-docker/contributors","subscribers_url":"https://api.github.com/repos/IDR/jupyter-docker/subscribers","subscription_url":"https://api.github.com/repos/IDR/jupyter-docker/subscription","commits_url":"https://api.github.com/repos/IDR/jupyter-docker/commits{/sha}","git_commits_url":"https://api.github.com/repos/IDR/jupyter-docker/git/commits{/sha}","comments_url":"https://api.github.com/repos/IDR/jupyter-docker/comments{/number}","issue_comment_url":"https://api.github.com/repos/IDR/jupyter-docker/issues/comments{/number}","contents_url":"https://api.github.com/repos/IDR/jupyter-docker/contents/{+path}","compare_url":"https://api.github.com/repos/IDR/jupyter-docker/compare/{base}...{head}","merges_url":"https://api.github.com/repos/IDR/jupyter-docker/merges","archive_url":"https://api.github.com/repos/IDR/jupyter-docker/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/IDR/jupyter-docker/downloads","issues_url":"https://api.github.com/repos/IDR/jupyter-docker/issues{/number}","pulls_url":"https://api.github.com/repos/IDR/jupyter-docker/pulls{/number}","milestones_url":"https://api.github.com/repos/IDR/jupyter-docker/milestones{/number}","notifications_url":"https://api.github.com/repos/IDR/jupyter-docker/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/IDR/jupyter-docker/labels{/name}","releases_url":"https://api.github.com/repos/IDR/jupyter-docker/releases{/id}","deployments_url":"https://api.github.com/repos/IDR/jupyter-docker/deployments","created_at":"2016-07-06T14:49:00Z","updated_at":"2017-03-21T08:39:26Z","pushed_at":"2017-05-30T15:21:02Z","git_url":"git://github.com/IDR/jupyter-docker.git","ssh_url":"git@github.com:IDR/jupyter-docker.git","clone_url":"https://github.com/IDR/jupyter-docker.git","svn_url":"https://github.com/IDR/jupyter-docker","homepage":null,"size":15,"stargazers_count":0,"watchers_count":0,"language":"Shell","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"open_issues_count":2,"forks":5,"open_issues":2,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8"},"html":{"href":"https://github.com/IDR/jupyter-docker/pull/8"},"issue":{"href":"https://api.github.com/repos/IDR/jupyter-docker/issues/8"},"comments":{"href":"https://api.github.com/repos/IDR/jupyter-docker/issues/8/comments"},"review_comments":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8/comments"},"review_comment":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/IDR/jupyter-docker/pulls/8/commits"},"statuses":{"href":"https://api.github.com/repos/IDR/jupyter-docker/statuses/f8fad70ef9fc040ab96a56f1f02d104f3ef43042"}}}}
{"actor":{"display_login":"joshmoore"}}