diff --git a/docker/15.3/Dockerfile b/docker/15.3/Dockerfile index b81185b..b96ebb2 100644 --- a/docker/15.3/Dockerfile +++ b/docker/15.3/Dockerfile @@ -24,15 +24,16 @@ RUN (apt-get update; \ apt-get clean -y) # Install Java -RUN (echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ - add-apt-repository -y ppa:webupd8team/java && \ - apt-get update && \ - apt-get install -y oracle-java7-installer && \ - rm -rf /var/cache/oracle-jdk7-installer) +echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ + 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/* && \ -ENV JAVA_HOME /usr/lib/jvm/java-7-oracle +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle ENV PATH $PATH:$JAVA_HOME/bin # diff --git a/docker/16.1/base/Dockerfile b/docker/16.1/base/Dockerfile new file mode 100644 index 0000000..bd69d62 --- /dev/null +++ b/docker/16.1/base/Dockerfile @@ -0,0 +1,49 @@ +# DOCKER-VERSION 1.0.0 +# +# The base Dockerfile for DISCVR-Seq Servers. This will install various sequence tools used by the pipelines +# + +from phusion/baseimage +maintainer bbimber@gmail.com + +# these will vary by LabKey version: +ENV TC_PROJECT LabKey_DISCVR161_Installers +ENV GZ_PREFIX LabKey16.1DISCVR +ENV DIST_NAME discvr +ENV SVN_BRANCH discvr16.1 +ENV LK_HOME /labkey + +# +# Create directories required for running LabKey Server +# +run mkdir -p /labkey/ +run mkdir -p /labkey/bin +run mkdir -p /labkey/svn + +# Update the Ubuntu and install required tools +RUN (apt-get update; \ + apt-get -y -q install wget tar unzip subversion wget python-software-properties software-properties-common; \ + apt-get clean -y) + +# Install Java +echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ + 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/* && \ + +ENV JAVA_HOME /usr/lib/jvm/java-8-oracle +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} + +#note: need to sort out users/permissions +#-u labkey +#chown -R labkey:labkey $LK_HOME + + diff --git a/docker/16.1/remote/Dockerfile b/docker/16.1/remote/Dockerfile new file mode 100644 index 0000000..5d3b6ba --- /dev/null +++ b/docker/16.1/remote/Dockerfile @@ -0,0 +1,37 @@ +# DOCKER-VERSION 1.0.0 +# +# Dockerfile for remote pipeline DISCVR-Seq Servers. This will install remote LabKey Server code in addition to various +# sequence tools used by the pipelines +# + +from bbimber/discvr-seq +maintainer bbimber@gmail.com + +# these will vary by LabKey version: +ENV TC_PROJECT LabKey_DISCVR161_Installers +ENV GZ_PREFIX LabKey16.1DISCVR +ENV DIST_NAME discvr +ENV SVN_BRANCH discvr16.1 +ENV LK_HOME /labkey + +# +# Create directories required for running LabKey Server +# +run mkdir -p /labkey/ +run mkdir -p /labkey/configs + +# download latest build +RUN wget -r --trust-server-names --no-check-certificate http://teamcity.labkey.org/guestAuth/repository/download/${TC_PROJECT}/.lastSuccessful/${DIST_NAME}/${GZ_PREFIX}-{build.number}-${DIST_NAME}-bin.tar.gz +RUN mv ./teamcity.labkey.org/guestAuth/repository/download/${TC_PROJECT}/.lastSuccessful/${DIST_NAME}/*.gz ./ +RUN rm -Rf ./teamcity.labkey.org + +RUN (GZ=$(ls -tr | grep '^LabKey.*\.gz$' | tail -n -1); \ + tar -xf $GZ; \ + DIR=$(echo $GZ | sed -e "s/.tar.gz$//"); \ + cp -R ${DIR}/bin $LK_HOME; \ + cp -R ${DIR}/modules $LK_HOME; \ + cp -R ${DIR}/labkeywebapp $LK_HOME; \ + cp -R ${DIR}/pipeline-lib $LK_HOME; \ + mkdir -p /labkey/apps/tomcat/lib/; \ + cp -f ${DIR}/tomcat-lib/*.jar /labkey/apps/tomcat/lib/; \ + rm -rf ${DIR}) diff --git a/docker/16.1/remote/etc/labkey/pipelineConfig.xml.j2 b/docker/16.1/remote/etc/labkey/pipelineConfig.xml.j2 new file mode 100644 index 0000000..e69de29 diff --git a/docker/16.1/remote/etc/my_init.d/pipelineConfig.sh b/docker/16.1/remote/etc/my_init.d/pipelineConfig.sh new file mode 100644 index 0000000..e69de29