From c98d5826befc82a327d1d173818da621d0c7a809 Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Mon, 3 Feb 2020 16:09:27 +0100
Subject: [PATCH] update blastp installation for prokka in all dockerfiles
(for_build)
---
for_build/annote_and_1tree/Dockerfile | 21 ++++++++++-----------
for_build/barrnap_only/Dockerfile | 2 +-
for_build/mafft/Dockerfile | 2 +-
for_build/ubuntu/Dockerfile | 2 +-
for_tests/Dockerfile | 1 +
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/for_build/annote_and_1tree/Dockerfile b/for_build/annote_and_1tree/Dockerfile
index a062bb44..f2ddbf04 100644
--- a/for_build/annote_and_1tree/Dockerfile
+++ b/for_build/annote_and_1tree/Dockerfile
@@ -1,27 +1,26 @@
-from ubuntu:latest
+from ubuntu:18.04
# Update apt-get packages
RUN apt-get update &&\
apt-get -y upgrade
-# Install package needed
+
+# Install packages needed and update pip
RUN apt-get install -y \
- python3\
- git \
wget \
+ python3 \
python3-pip
-
-
# Upgrade pip
RUN pip3 install --upgrade pip
-# Update makeblastdb for prokka
+# Update makeblastdb and blastp for prokka
WORKDIR /tmp
-RUN wget ftp://ftp.ncbi.nlm.nih.gov/blast/executables/LATEST/ncbi-blast-2.9.0+-x64-linux.tar.gz &&\
- tar zxvpf ncbi-blast-2.9.0+-x64-linux.tar.gz &&\
- cp /tmp/ncbi-blast-2.9.0+/bin/makeblastdb /usr/local/bin/ &&\
- rm ncbi-blast-2.9.0+-x64-linux.tar.gz
+RUN wget ftp://ftp.ncbi.nlm.nih.gov/blast/executables/LATEST/ncbi-blast-2.10.0+-x64-linux.tar.gz &&\
+ tar zxvpf ncbi-blast-2.10.0+-x64-linux.tar.gz &&\
+ cp /tmp/ncbi-blast-2.10.0+/bin/makeblastdb /usr/local/bin/ &&\
+ cp /tmp/ncbi-blast-2.10.0+/bin/blastp /usr/local/bin/ &&\
+ rm ncbi-blast-2.10.0+-x64-linux.tar.gz
# Install prokka:
diff --git a/for_build/barrnap_only/Dockerfile b/for_build/barrnap_only/Dockerfile
index 5ddd5e61..bedd3541 100644
--- a/for_build/barrnap_only/Dockerfile
+++ b/for_build/barrnap_only/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:latest
+from ubuntu:18.04
# Update apt-get packages
RUN apt-get update &&\
diff --git a/for_build/mafft/Dockerfile b/for_build/mafft/Dockerfile
index 5270a5f9..b7044242 100644
--- a/for_build/mafft/Dockerfile
+++ b/for_build/mafft/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:latest
+from ubuntu:18.04
# Update apt-get packages
RUN apt-get update &&\
diff --git a/for_build/ubuntu/Dockerfile b/for_build/ubuntu/Dockerfile
index 7ca430ee..47efcbda 100644
--- a/for_build/ubuntu/Dockerfile
+++ b/for_build/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-from ubuntu:latest
+from ubuntu:18.04
# Update apt-get packages
RUN apt-get update &&\
diff --git a/for_tests/Dockerfile b/for_tests/Dockerfile
index c5d182c2..419bc3b3 100644
--- a/for_tests/Dockerfile
+++ b/for_tests/Dockerfile
@@ -10,6 +10,7 @@ RUN apt-get install -y \
wget \
python3 \
python3-pip
+# Upgrade pip
RUN pip3 install --upgrade pip
--
GitLab