From 845d3f24f4ca22f156da41d30d878d9529a18aa4 Mon Sep 17 00:00:00 2001 From: Stephen Ficklin Date: Wed, 11 Dec 2019 22:49:30 -0800 Subject: [PATCH] Fixed versioning of Docker images --- docker/aspera/{3.8.1 => 3.8.1-1.1}/Dockerfile | 0 docker/fastqc/{0.11.7 => 0.11.7-1.1}/Dockerfile | 0 docker/hisat2/{2.1.0 => 2.1.0-1.1}/Dockerfile | 0 docker/kallisto/{0.45.0 => 0.45.0-1.1}/Dockerfile | 0 docker/multiqc/1.7/Dockerfile | 8 -------- docker/multiqc/{1.8 => 1.8-1.1}/Dockerfile | 0 docker/python/{3.7 => 3.7-1.1}/Dockerfile | 0 docker/salmon/{0.12.0 => 0.12.0-1.1}/Dockerfile | 0 docker/samtools/{1.9 => 1.9-1.1}/Dockerfile | 0 docker/sratoolkit/{2.10.0 => 2.10.0-1.1}/Dockerfile | 0 docker/sratoolkit/2.9.6/Dockerfile | 8 -------- docker/stringtie/{1.3.4d => 1.3.4d-1.1}/Dockerfile | 0 docker/trimmomatic/{0.38 => 0.38-1.1}/Dockerfile | 0 13 files changed, 16 deletions(-) rename docker/aspera/{3.8.1 => 3.8.1-1.1}/Dockerfile (100%) rename docker/fastqc/{0.11.7 => 0.11.7-1.1}/Dockerfile (100%) rename docker/hisat2/{2.1.0 => 2.1.0-1.1}/Dockerfile (100%) rename docker/kallisto/{0.45.0 => 0.45.0-1.1}/Dockerfile (100%) delete mode 100644 docker/multiqc/1.7/Dockerfile rename docker/multiqc/{1.8 => 1.8-1.1}/Dockerfile (100%) rename docker/python/{3.7 => 3.7-1.1}/Dockerfile (100%) rename docker/salmon/{0.12.0 => 0.12.0-1.1}/Dockerfile (100%) rename docker/samtools/{1.9 => 1.9-1.1}/Dockerfile (100%) rename docker/sratoolkit/{2.10.0 => 2.10.0-1.1}/Dockerfile (100%) delete mode 100644 docker/sratoolkit/2.9.6/Dockerfile rename docker/stringtie/{1.3.4d => 1.3.4d-1.1}/Dockerfile (100%) rename docker/trimmomatic/{0.38 => 0.38-1.1}/Dockerfile (100%) diff --git a/docker/aspera/3.8.1/Dockerfile b/docker/aspera/3.8.1-1.1/Dockerfile similarity index 100% rename from docker/aspera/3.8.1/Dockerfile rename to docker/aspera/3.8.1-1.1/Dockerfile diff --git a/docker/fastqc/0.11.7/Dockerfile b/docker/fastqc/0.11.7-1.1/Dockerfile similarity index 100% rename from docker/fastqc/0.11.7/Dockerfile rename to docker/fastqc/0.11.7-1.1/Dockerfile diff --git a/docker/hisat2/2.1.0/Dockerfile b/docker/hisat2/2.1.0-1.1/Dockerfile similarity index 100% rename from docker/hisat2/2.1.0/Dockerfile rename to docker/hisat2/2.1.0-1.1/Dockerfile diff --git a/docker/kallisto/0.45.0/Dockerfile b/docker/kallisto/0.45.0-1.1/Dockerfile similarity index 100% rename from docker/kallisto/0.45.0/Dockerfile rename to docker/kallisto/0.45.0-1.1/Dockerfile diff --git a/docker/multiqc/1.7/Dockerfile b/docker/multiqc/1.7/Dockerfile deleted file mode 100644 index 08690b60..00000000 --- a/docker/multiqc/1.7/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM gemmaker/python:3.7-1.1 - -# Install MultiQC -RUN pip3 install https://github.com/ewels/MultiQC/archive/v1.7.zip \ - && pip3 install decorator>=4.3.0 && pip3 install networkx - -ENV LC_ALL=C.UTF-8 -ENV LANG=C.UTF-8 diff --git a/docker/multiqc/1.8/Dockerfile b/docker/multiqc/1.8-1.1/Dockerfile similarity index 100% rename from docker/multiqc/1.8/Dockerfile rename to docker/multiqc/1.8-1.1/Dockerfile diff --git a/docker/python/3.7/Dockerfile b/docker/python/3.7-1.1/Dockerfile similarity index 100% rename from docker/python/3.7/Dockerfile rename to docker/python/3.7-1.1/Dockerfile diff --git a/docker/salmon/0.12.0/Dockerfile b/docker/salmon/0.12.0-1.1/Dockerfile similarity index 100% rename from docker/salmon/0.12.0/Dockerfile rename to docker/salmon/0.12.0-1.1/Dockerfile diff --git a/docker/samtools/1.9/Dockerfile b/docker/samtools/1.9-1.1/Dockerfile similarity index 100% rename from docker/samtools/1.9/Dockerfile rename to docker/samtools/1.9-1.1/Dockerfile diff --git a/docker/sratoolkit/2.10.0/Dockerfile b/docker/sratoolkit/2.10.0-1.1/Dockerfile similarity index 100% rename from docker/sratoolkit/2.10.0/Dockerfile rename to docker/sratoolkit/2.10.0-1.1/Dockerfile diff --git a/docker/sratoolkit/2.9.6/Dockerfile b/docker/sratoolkit/2.9.6/Dockerfile deleted file mode 100644 index 76d724b0..00000000 --- a/docker/sratoolkit/2.9.6/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM gemmaker/aspera:3.8.1-1.1 - -# Install the SRA toolkit. -RUN wget -q https://ftp-trace.ncbi.nlm.nih.gov/sra/sdk/2.9.6/sratoolkit.2.9.6-ubuntu64.tar.gz \ - && tar -xf sratoolkit.2.9.6-ubuntu64.tar.gz \ - && mv sratoolkit.2.9.6-ubuntu64 /usr/local/sratoolkit.2.9.6 - -ENV PATH "$PATH:/usr/local/sratoolkit.2.9.6/bin" diff --git a/docker/stringtie/1.3.4d/Dockerfile b/docker/stringtie/1.3.4d-1.1/Dockerfile similarity index 100% rename from docker/stringtie/1.3.4d/Dockerfile rename to docker/stringtie/1.3.4d-1.1/Dockerfile diff --git a/docker/trimmomatic/0.38/Dockerfile b/docker/trimmomatic/0.38-1.1/Dockerfile similarity index 100% rename from docker/trimmomatic/0.38/Dockerfile rename to docker/trimmomatic/0.38-1.1/Dockerfile