diff --git a/src/conda_packages.sh b/src/conda_packages.sh index 1f54db0ba65b3d3177fcf9ccc37c4084fcc5fbef..66a00c25f97e0a12beace017922cbd11baa80848 100644 --- a/src/conda_packages.sh +++ b/src/conda_packages.sh @@ -48,7 +48,6 @@ install_env deeptools 3.0.2 deeptools install_env htseq 0.9.1 htseq install_env htseq 0.11.2 htseq install_env python 3.7 python -install_env R 3.5.3 R install_env R 3.4.3 R install_env R 3.3.1 R install_env file handle 0.1.1 file handle diff --git a/src/docker_modules/sambamba/0.6.9/Dockerfile b/src/docker_modules/sambamba/0.6.9/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..689d0265c734c597a1983491918258909e33c9fe --- /dev/null +++ b/src/docker_modules/sambamba/0.6.9/Dockerfile @@ -0,0 +1,17 @@ +FROM ubuntu:18.04 +MAINTAINER Laurent Modolo + +ENV SAMBAMBA_VERSION=0.6.9 +ENV PACKAGES curl=7.58.0* \ + ca-certificates=20180409 \ + build-essential=12.4* \ + zlib1g-dev=1:1.2.11* + +RUN apt-get update && \ + apt-get install -y --no-install-recommends ${PACKAGES} && \ + apt-get clean + +RUN curl -k -L https://github.com/biod/sambamba/releases/download/v${SAMBAMBA_VERSION}/sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 -o sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 && \ +tar xvjf sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 && \ +mv sambamba /usr/bin/ && \ +rm -R sambamba_v${SAMBAMBA_VERSION}_linux* diff --git a/src/docker_modules/sambamba/0.6.9/docker_init.sh b/src/docker_modules/sambamba/0.6.9/docker_init.sh new file mode 100755 index 0000000000000000000000000000000000000000..f9a2f992ecfc20356d8b90f335f18bbe25182b7c --- /dev/null +++ b/src/docker_modules/sambamba/0.6.9/docker_init.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker build src/docker_modules/sambamba/0.6.9 -t 'sambamba:0.6.9' diff --git a/src/nf_modules/sambamba/index_bams.config b/src/nf_modules/sambamba/index_bams.config index 335f0fa65a67dda8bc81b45a02c9ff019fe83b65..e8ab95accf3973a81f4507b1d6f726efe3036963 100644 --- a/src/nf_modules/sambamba/index_bams.config +++ b/src/nf_modules/sambamba/index_bams.config @@ -4,7 +4,7 @@ profiles { docker.enabled = true process { withName: index_bam { - container = "sambamba:0.6.7" + container = "sambamba:0.6.9" cpus = 4 } } @@ -13,7 +13,7 @@ profiles { singularity.enabled = true process { withName: index_bam { - container = "file://bin/sambamba:0.6.7.img" + container = "file://bin/sambamba:0.6.9.img" cpus = 4 } } @@ -22,7 +22,7 @@ profiles { process{ withName: index_bam { beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules" - module = "sambamba/0.6.7" + module = "sambamba/0.6.9" executor = "sge" clusterOptions = "-cwd -V" cpus = 16 @@ -37,7 +37,7 @@ profiles { process{ withName: index_bam { beforeScript = "sh /sps/lbmc/common/miniconda3/init.sh" - conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.7" + conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.9" scratch = true stageInMode = "copy" stageOutMode = "rsync" diff --git a/src/nf_modules/sambamba/sort_bams.config b/src/nf_modules/sambamba/sort_bams.config index 6865c9a3a55d04ce5fce5bee68d9313702a4b84c..a408436b56372fc8201978b9dccf231cdd5714b8 100644 --- a/src/nf_modules/sambamba/sort_bams.config +++ b/src/nf_modules/sambamba/sort_bams.config @@ -4,7 +4,7 @@ profiles { docker.enabled = true process { withName: sort_bam { - container = "sambamba:0.6.7" + container = "sambamba:0.6.9" cpus = 4 } } @@ -13,7 +13,7 @@ profiles { singularity.enabled = true process { withName: sort_bam { - container = "file://bin/sambamba:0.6.7.img" + container = "file://bin/sambamba:0.6.9.img" cpus = 4 } } @@ -22,7 +22,7 @@ profiles { process{ withName: sort_bam { beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules" - module = "sambamba/0.6.7" + module = "sambamba/0.6.9" executor = "sge" clusterOptions = "-cwd -V" cpus = 4 @@ -37,7 +37,7 @@ profiles { process{ withName: sort_bam { beforeScript = "sh /sps/lbmc/common/miniconda3/init.sh" - conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.7" + conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.9" scratch = true stageInMode = "copy" stageOutMode = "rsync" diff --git a/src/nf_modules/sambamba/split_bams.config b/src/nf_modules/sambamba/split_bams.config index 740c51e001c652cbd4eacb4c12181e82ffbb474e..4bc3cda1036bfe310dc516fc999784a10c6bf4fe 100644 --- a/src/nf_modules/sambamba/split_bams.config +++ b/src/nf_modules/sambamba/split_bams.config @@ -4,7 +4,7 @@ profiles { docker.enabled = true process { withName: split_bam { - container = "sambamba:0.6.7" + container = "sambamba:0.6.9" cpus = 4 } } @@ -13,7 +13,7 @@ profiles { singularity.enabled = true process { withName: split_bam { - container = "file://bin/sambamba:0.6.7.img" + container = "file://bin/sambamba:0.6.9.img" cpus = 4 } } @@ -22,7 +22,7 @@ profiles { process{ withName: split_bam { beforeScript = "source /usr/share/lmod/lmod/init/bash; module use ~/privatemodules" - module = "sambamba/0.6.7" + module = "sambamba/0.6.9" executor = "sge" clusterOptions = "-cwd -V" cpus = 16 @@ -37,7 +37,7 @@ profiles { process{ withName: split_bam { beforeScript = "sh /sps/lbmc/common/miniconda3/init.sh" - conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.7" + conda = "/sps/lbmc/common/miniconda3/envs/sambamba_0.6.9" scratch = true stageInMode = "copy" stageOutMode = "rsync" diff --git a/src/psmn_modules b/src/psmn_modules index 7941cf21b2ec744bb8d2eae0a623305c4ee23ced..8a86db97eb89833a88b1ee876880cb1c07ce8565 160000 --- a/src/psmn_modules +++ b/src/psmn_modules @@ -1 +1 @@ -Subproject commit 7941cf21b2ec744bb8d2eae0a623305c4ee23ced +Subproject commit 8a86db97eb89833a88b1ee876880cb1c07ce8565 diff --git a/src/singularity_modules/sambamba/0.6.9/build.sh b/src/singularity_modules/sambamba/0.6.9/build.sh new file mode 100755 index 0000000000000000000000000000000000000000..4976ecc20944982a7ac5f1e708568e8f763c1334 --- /dev/null +++ b/src/singularity_modules/sambamba/0.6.9/build.sh @@ -0,0 +1,3 @@ +#/bin/sh +sudo singularity build --force bin/sambamba:0.6.9.img src/singularity_modules/sambamba/0.6.9/sambamba.def && \ +singularity sign bin/sambamba:0.6.9.img diff --git a/src/singularity_modules/sambamba/0.6.9/sambamba b/src/singularity_modules/sambamba/0.6.9/sambamba new file mode 100644 index 0000000000000000000000000000000000000000..35b6aa7294bf723e51c477d4b4d23b1b80a249a0 --- /dev/null +++ b/src/singularity_modules/sambamba/0.6.9/sambamba @@ -0,0 +1,2 @@ +#/bin/bash +singularity exec /sps/lbmc/common/singularity/sambamba:0.6.7.img sambamba $@ diff --git a/src/singularity_modules/sambamba/0.6.9/sambamba.def b/src/singularity_modules/sambamba/0.6.9/sambamba.def new file mode 100644 index 0000000000000000000000000000000000000000..b5fbfec8fc6eea069740ffb93708e7ff1cf08222 --- /dev/null +++ b/src/singularity_modules/sambamba/0.6.9/sambamba.def @@ -0,0 +1,27 @@ +Bootstrap: docker +From: ubuntu:18.04 + +%labels +MAINTAINER Laurent Modolo + +%post +SAMBAMBA_VERSION=0.6.9 +PACKAGES="curl=7.58.0* \ +ca-certificates=20180409 \ +build-essential=12.4* \ +zlib1g-dev=1:1.2.11*" + +apt-get update && \ +apt-get install -y --no-install-recommends ${PACKAGES} && \ +apt-get clean + +curl -k -L https://github.com/biod/sambamba/releases/download/v${SAMBAMBA_VERSION}/sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 -o sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 && \ +tar xvjf sambamba_v${SAMBAMBA_VERSION}_linux.tar.bz2 && \ +mv sambamba /usr/bin/ && \ +rm -R sambamba_v${SAMBAMBA_VERSION}_linux* + +%environment +export SAMBAMBA_VERSION=0.6.9 + +%runscript +exec /bin/bash "$@"