From 01bdba4dcc4cb3d36fe08071389c22cb4f4390e2 Mon Sep 17 00:00:00 2001
From: Christian Wiedemann <christian.wiedemann@key-tec.de>
Date: Mon, 2 Jul 2018 16:57:51 +0200
Subject: [PATCH 1/2] Fix server-ssh-add

---
 .circleci/config.yml | 4 ++--
 bin/acp.sh           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 19bceb5..3f4fa63 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,9 +2,9 @@ version: 2
 jobs:
   build:
     docker:
-      - image: debian:stretch
+      - image: docksal/cli:2.0-php7.1
     steps:
       - checkout
       - run:
           name: Install pipeline
-          command: ./bin/acp.sh _install-pipeline
\ No newline at end of file
+          command: ./bin/acp.sh _install-pipeline
diff --git a/bin/acp.sh b/bin/acp.sh
index 3b0bd7e..d47140f 100755
--- a/bin/acp.sh
+++ b/bin/acp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ANSIBLE_VERSION="2.4.4"
-ANDOCK_CI_VERSION=0.3.4
+ANDOCK_CI_VERSION=0.3.5
 
 REQUIREMENTS_ANDOCK_CI_BUILD='0.1.0'
 REQUIREMENTS_ANDOCK_CI_FIN='0.2.1'
@@ -809,7 +809,7 @@ run_server_ssh_add ()
         shift
     fi
 
-    ansible-playbook -i "${ANDOCK_CI_INVENTORY}/${connection}" -e "ssh_key='$ssh_key'" "${ANDOCK_CI_PLAYBOOK}/server_ssh_add.yml"
+    ansible-playbook -e "ansible_ssh_user=$root_user" -i "${ANDOCK_CI_INVENTORY}/${connection}" -e "ssh_key='$ssh_key'" "${ANDOCK_CI_PLAYBOOK}/server_ssh_add.yml"
     echo-green "SSH key was added."
 }
 

From f4719e7e2d5602435d2c5f7a3f6a00c1fa4f2db9 Mon Sep 17 00:00:00 2001
From: Christian Wiedemann <christian.wiedemann@key-tec.de>
Date: Mon, 2 Jul 2018 16:58:29 +0200
Subject: [PATCH 2/2] Update to 0.3.6

---
 bin/acp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/acp.sh b/bin/acp.sh
index d47140f..50a2ab2 100755
--- a/bin/acp.sh
+++ b/bin/acp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ANSIBLE_VERSION="2.4.4"
-ANDOCK_CI_VERSION=0.3.5
+ANDOCK_CI_VERSION=0.3.6
 
 REQUIREMENTS_ANDOCK_CI_BUILD='0.1.0'
 REQUIREMENTS_ANDOCK_CI_FIN='0.2.1'