From 95be14cef7e36c985cede378ab2a7b6f62b53cd6 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
Date: Fri, 30 Jun 2017 10:37:15 +0200
Subject: [PATCH 1/3] Docker upgrade

---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8c1e0f4..760ecba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,7 @@ deploy_review:
   before_script:
     - apk add --no-cache py-pip
     - pip install docker-compose
+    - pip install -U docker==2.4.2
     - mkdir -p $DOCKER_CERT_PATH
     - echo "$DEPLOYMENT_CACERT"      > $DOCKER_CERT_PATH/ca.pem
     - echo "$DEPLOYMENT_CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem
@@ -64,7 +65,5 @@ deploy_review:
   image: docker:17
   dependencies:
     - build_job
-  only:
-    - develop
   tags:
     - docker

From 266573f45661ef358aeea289ad5a0b670d83f255 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
Date: Fri, 30 Jun 2017 10:58:14 +0200
Subject: [PATCH 2/3] pip upgrade, install specific docker-compose version

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 760ecba..f485b78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,7 @@
 variables:
   GIT_SUBMODULE_STRATEGY: normal
+  DOCKER_COMPOSE_VERSION: 1.14.0
+  PY_DOCKER_VERSION: 2.4.2
   CI: "true"
 
 cache:
@@ -51,8 +53,9 @@ deploy_review:
     DOCKER_CERT_PATH: "certs"
   before_script:
     - apk add --no-cache py-pip
-    - pip install docker-compose
-    - pip install -U docker==2.4.2
+    - pip install --upgrade pip
+    - pip install docker-compose==$DOCKER_COMPOSE_VERSION
+    - pip install -U docker==$PY_DOCKER_VERSION
     - mkdir -p $DOCKER_CERT_PATH
     - echo "$DEPLOYMENT_CACERT"      > $DOCKER_CERT_PATH/ca.pem
     - echo "$DEPLOYMENT_CLIENT_CERT" > $DOCKER_CERT_PATH/cert.pem

From 003ab30cab726d508f9776c8a97f05b740cf78c6 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
Date: Fri, 30 Jun 2017 12:03:37 +0200
Subject: [PATCH 3/3] deploy only on develop branch

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f485b78..170624c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,8 @@ test_job:
 
 deploy_review:
   stage: deploy
+  only:
+    - develop
   environment: review
   variables:
     COMPOSE_TLS_VERSION: "TLSv1_2"