From 5289ccb2e1f65c53c8b36adb00218b6c1c9b1c6f Mon Sep 17 00:00:00 2001
From: Sascha Marcel Schmidt <mail@saschaschmidt.net>
Date: Sat, 10 Jun 2017 10:34:13 +0200
Subject: [PATCH] use composer docker image instead of docker script, also set
 specific version for deployer image

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 638ce5a5..5b522901 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,13 +13,14 @@ stages:
 
 build:
     stage: build
+    image: composer
     variables:
         GIT_STRATEGY: "clone"
         GIT_SUBMODULE_STRATEGY: "recursive"
     script:
-        - ./.gitlab-ci/scripts/composer.sh config store-auths false
-        - ./.gitlab-ci/scripts/composer.sh config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
-        - ./.gitlab-ci/scripts/composer.sh install
+        - composer config store-auths false
+        - composer config http-basic.git-t3o.typo3.org gitlab-ci-token ${CI_BUILD_TOKEN}
+        - composer install
     artifacts:
         paths:
             - ./
@@ -39,7 +40,6 @@ layout:
         paths:
           - ./
         expire_in: '7d'
-    environment: ${CI_BUILD_REF_NAME}
     dependencies:
         - build
     except:
@@ -52,7 +52,7 @@ layout:
         - eval $(ssh-agent -s)
         - echo "$SSH_PRIVATE_KEY" | ssh-add -
     script:
-        - ./.gitlab-ci/scripts/deployer.sh -f/src/.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
+        - VERSION=4.0.0-alpine ./.gitlab-ci/scripts/deployer.sh -f/src/.gitlab-ci/deployer/deploy.php deploy ${CI_BUILD_REF_NAME}
     when: manual
     dependencies:
         - layout
-- 
GitLab