From ee2dfb7002c1a553e123f58ff1b3a5b1df7f63f4 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <thomas.citharel@framasoft.org>
Date: Fri, 26 Oct 2018 11:17:18 +0200
Subject: [PATCH] give up on bash & alpine

---
 .gitlab-ci.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee08dc53..2f846e9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,7 @@
-image: alpine:latest
+image: framasoft/framadate-ci
 
 pages:
   stage: deploy
-  before_script:
-  - apk --update add openssh-client && apk add bash
   script:
   - mkdir "${HOME}/.ssh"
   - chmod 700 "${HOME}/.ssh"
@@ -11,10 +9,10 @@ pages:
   - mkdir .public
   - cp -r * .public
   - mv .public public
-  - bash -c 'if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi'
+  - if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
   - eval `ssh-agent -s`
-  - bash -c 'if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi'
-  - bash -c 'if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then rsync -a --delete --exclude stats/ --exclude error/ public/ ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web/; fi'
+  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi
+  - if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then rsync -a --delete --exclude stats/ --exclude error/ public/ ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web/; fi
   artifacts:
     paths:
     - public