From 4344a909218d823ce36b69fec0b1fe2bff85db29 Mon Sep 17 00:00:00 2001 From: bbimber Date: Fri, 8 Apr 2016 15:39:15 -0700 Subject: [PATCH 1/2] Update Dockerfile --- docker/base/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 874484f..1db104a 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -30,7 +30,6 @@ RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true add-apt-repository -y ppa:webupd8team/java && \ apt-get update && \ apt-get install -y oracle-java8-installer && \ - rm -rf /var/lib/apt/lists/* && \ rm -rf /var/cache/oracle-jdk8-installer #rm -rf /var/lib/apt/lists/* && \ @@ -42,6 +41,9 @@ ENV PATH $PATH:$JAVA_HOME/bin RUN svn co --username cpas --password cpas --no-auth-cache https://hedgehog.fhcrc.org/tor/stedi/branches/${SVN_BRANCH}/externalModules/labModules/SequenceAnalysis/pipeline_code ${LK_HOME}/svn/ RUN ${LK_HOME}/svn/sequence_tools_install.sh -d ${LK_HOME} +# Clean up +RUN rm -rf /var/lib/apt/lists/* + #note: need to sort out users/permissions #-u labkey #chown -R labkey:labkey $LK_HOME From a143d5b453cc4012fb1fca90c4e0562b47eac6da Mon Sep 17 00:00:00 2001 From: bbimber Date: Thu, 28 Apr 2016 17:02:05 -0700 Subject: [PATCH 2/2] clean up after install --- docker/base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 1db104a..d51bd8a 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -40,6 +40,7 @@ ENV PATH $PATH:$JAVA_HOME/bin # this is not the ideal way to install all these tools, but the code is currently shared by non-docker usages RUN svn co --username cpas --password cpas --no-auth-cache https://hedgehog.fhcrc.org/tor/stedi/branches/${SVN_BRANCH}/externalModules/labModules/SequenceAnalysis/pipeline_code ${LK_HOME}/svn/ RUN ${LK_HOME}/svn/sequence_tools_install.sh -d ${LK_HOME} +RUN rm -Rf ${LK_HOME}/tool_src # Clean up RUN rm -rf /var/lib/apt/lists/*