From 80e7c8ec388c70b116801932be5c4c0e47cbd375 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Tue, 30 Apr 2019 10:13:03 +0200
Subject: [PATCH] changes for building all images

---
 for_build/barrnap_only/Dockerfile      |  9 +++++----
 for_build/mafft/Dockerfile             | 18 +++++++++---------
 for_build/mmseqs_and_fastme/Dockerfile |  6 ++++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/for_build/barrnap_only/Dockerfile b/for_build/barrnap_only/Dockerfile
index becaf686..5ddd5e61 100644
--- a/for_build/barrnap_only/Dockerfile
+++ b/for_build/barrnap_only/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:16.04
+from ubuntu:latest
 
 # Update apt-get packages
 RUN apt-get update &&\
@@ -6,18 +6,19 @@ RUN apt-get update &&\
 
 # Install package needed
 RUN apt-get install -y \
-        wget \
+        python3 \
         python3-pip \
+        git \
+        wget \
         libdatetime-perl \
         libxml-simple-perl \
         libdigest-md5-perl \
-        git \
         default-jre \
         bioperl
 
-# Update pip
 RUN pip3 install --upgrade pip
 
+
 # Install barrnap
 WORKDIR /tmp
 RUN wget https://github.com/tseemann/barrnap/archive/0.8.tar.gz &&\
diff --git a/for_build/mafft/Dockerfile b/for_build/mafft/Dockerfile
index c93e4ce4..12d94b00 100644
--- a/for_build/mafft/Dockerfile
+++ b/for_build/mafft/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:16.04
+from ubuntu:latest
 
 # Update apt-get packages
 RUN apt-get update &&\
@@ -6,20 +6,20 @@ RUN apt-get update &&\
 
 # Install package needed
 RUN apt-get install -y \
+        python3 \
+        python3-pip \
         wget \
-        python3-pip
-
-# Update pip
-RUN pip3 install --upgrade pip
-
-RUN apt-get install -y\
+        git \
         libdatetime-perl \
         libxml-simple-perl \
         libdigest-md5-perl \
-        git \
         default-jre \
         bioperl
 
+# Update pip
+RUN pip3 install --upgrade pip
+
+
 # Install mafft 7.313
 RUN rm /usr/bin/mafft  # remove mafft installed with bioperl
 WORKDIR /tmp
@@ -29,4 +29,4 @@ RUN wget https://mafft.cbrc.jp/alignment/software/mafft-7.313-with-extensions-sr
 WORKDIR /tmp/mafft-7.313-with-extensions/core
 RUN make clean &&\
     make &&\
-    make install
\ No newline at end of file
+    make install
diff --git a/for_build/mmseqs_and_fastme/Dockerfile b/for_build/mmseqs_and_fastme/Dockerfile
index 38fb8e68..67d49924 100644
--- a/for_build/mmseqs_and_fastme/Dockerfile
+++ b/for_build/mmseqs_and_fastme/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:16.04
+from ubuntu:latest
 
 
 # Update apt-get packages
@@ -9,7 +9,9 @@ RUN apt-get update &&\
 # Install package needed and update pip
 RUN apt-get install -y \
         wget \
-        python3-pip
+        python3 \
+        python3-pip \
+        git
 
 RUN pip3 install --upgrade pip
 
-- 
GitLab