Merge branch 'dev' into 'master'

Dev See merge request !5
shaman-narayanasamy · Oct 13, 2016 · a0ba37a · a0ba37a
2 parents 1e73790 + d36c680
commit a0ba37a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -176,30 +176,32 @@ an-mt:
         - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db analysis --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step --single-omics
 
 
-binny-mgmt:
-    stage: binning
-    script:
-        - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
-        - cp -r /mnt/data/input/binny-mgmt/* $CI_PROJECT_DIR/$CI_BUILD_ID
-        - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db binning --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step
-
-binny-mg:
-    stage: binning
-    script:
-        - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
-        - cp -r /mnt/data/input/binny-mg/* $CI_PROJECT_DIR/$CI_BUILD_ID
-        - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db binning --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step --single-omics
+# binny-mgmt:
+#     stage: binning
+#     script:
+#         - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
+#         - cp -r /mnt/data/input/binny-mgmt/* $CI_PROJECT_DIR/$CI_BUILD_ID
+#         - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db binning --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step
+#
+# binny-mg:
+#     stage: binning
+#     script:
+#         - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
+#         - cp -r /mnt/data/input/binny-mg/* $CI_PROJECT_DIR/$CI_BUILD_ID
+#         - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db binning --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step --single-omics
 
 
 maxbin-mgmt:
-    stage: binning
+    stage: manual
+    when: manual
     script:
         - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
         - cp -r /mnt/data/input/maxbin-mgmt/* $CI_PROJECT_DIR/$CI_BUILD_ID
         - impy -s . -c $CI_PROJECT_DIR/test/default.conf.json -d /mnt/data/db -b maxbin binning --data-dir $CI_PROJECT_DIR/$CI_BUILD_ID --single-step
 
 maxbin-mg:
-    stage: binning
+    stage: manual
+    when: manual
     script:
         - mkdir -p $CI_PROJECT_DIR/$CI_BUILD_ID
         - cp -r /mnt/data/input/maxbin-mg/* $CI_PROJECT_DIR/$CI_BUILD_ID

diff --git a/docker/Dockerfile-dependencies b/docker/Dockerfile-dependencies
@@ -1,6 +1,6 @@
 # Base container with tools dependencies for the IMP pipeline
 #
-# VERSION       1.4.1
+# VERSION       1.4
 
 FROM ubuntu:trusty
 MAINTAINER yohan.jarosz@uni.lu