From 8b1203834fad90c5ef545fe2a220de31eeae758b Mon Sep 17 00:00:00 2001
From: Amandine PERRIN <amandine.perrin@pasteur.fr>
Date: Mon, 7 Oct 2019 10:30:30 +0200
Subject: [PATCH] Test building image for tests + for annotate-tree
---
.gitlab-ci.yml | 22 +++++++++++-----------
for_build/annote_and_1tree/Dockerfile | 8 ++++++++
for_tests/Dockerfile | 2 +-
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4f15f00..7c37f2ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,17 +34,17 @@ build-test-image:
# tags:
# - k8s
-# build-install-annote-and-quicktree:
-# only:
-# - docker
-# stage: build
-# script:
-# - apk update #; apk add git
-# # - git checkout master -- requirements.txt
-# - docker build --pull -t "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree" for_build/annote_and_1tree
-# - docker push "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree"
-# tags:
-# - k8s
+build-install-annote-and-quicktree:
+ only:
+ - docker
+ stage: build
+ script:
+ - apk update #; apk add git
+ # - git checkout master -- requirements.txt
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree" for_build/annote_and_1tree
+ - docker push "$CI_REGISTRY_IMAGE/install-ubuntu-annote-quicktree"
+ tags:
+ - k8s
# build-ubuntu:
# only:
diff --git a/for_build/annote_and_1tree/Dockerfile b/for_build/annote_and_1tree/Dockerfile
index 4ff9d5d6..a062bb44 100644
--- a/for_build/annote_and_1tree/Dockerfile
+++ b/for_build/annote_and_1tree/Dockerfile
@@ -16,6 +16,14 @@ RUN apt-get install -y \
RUN pip3 install --upgrade pip
+# Update makeblastdb 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
+
+
# Install prokka:
WORKDIR /tmp
RUN apt-get install -y\
diff --git a/for_tests/Dockerfile b/for_tests/Dockerfile
index d7a21f0e..4a339786 100644
--- a/for_tests/Dockerfile
+++ b/for_tests/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get install -y \
RUN pip3 install --upgrade pip
-# Update makeblastdb
+# Update makeblastdb 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 &&\
--
GitLab