diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4f15f0027abfbaf538a878753ef3816a52c781e..7c37f2ac1ff061cfeb9651ea1c62c30d69983f38 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 4ff9d5d6f186654dcd9f8e3b10f6893d778f75c7..a062bb445880aaf8c5374c7810b4c8e177fa4c03 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 d7a21f0e052033fb08c9a3fb25987b4007b2ca3d..4a3397863dfc2040f43b8d683bec4e3655add01b 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 &&\