Merge pull request #16 from andock-ci/develop

Version 0.3.6
andock-ci · Jul 2, 2018 · 1ed1824 · 1ed1824
2 parents bc45858 + 8f0d77c
commit 1ed1824
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
+          command: ./bin/acp.sh _install-pipeline
diff --git 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.6
 
 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."
 }