From 5c31196311f47074de92e80e0ae9df91a8ce8cda Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Wed, 2 May 2018 23:17:33 +0200
Subject: [PATCH] Merge branch
 '5830-use-precompiled-images-for-transifex-stage-base-on-php-cli-stretch'
 into '1.3-dev'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve "Use precompiled images for transifex stage base on php-cli stretch"

Closes #5830

See merge request fusiondirectory/fd!257

(cherry picked from commit 3c888fd7493e95bfb8b6894b20c02fe706a9d220)

c7edb68c :ambulance: fix(gitlab) Use precompiled images for transifex stage base on php-cli stretch
6c017e0c :ambulance: fix(gitlab-ci) Use precompiled images for transifex stage base on php-cli stretch
12cfe799 :ambulance: fix(gitlab-ci) Use precompiled images for transifex stage base on php-cli stretch
fc310275 Revert ":ambulance: fix(gitlab-ci) Use precompiled images for transifex stage…
100534ed Revert ":ambulance: fix(gitlab-ci) Use precompiled images for transifex stage…
---
 .gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 802a2ab8d..a5d8904af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,24 +88,26 @@ create_manpages_lint_report:
 
 # fusiondirectory-update-locale
 fusiondirectory-update-locale:
+  image: php:cli-stretch
   stage: transifex
   only:
     - branches
   before_script:
     - apt-get update -qq
-    - apt-get install -y -qq gettext git php-cli
+    - apt-get install -y -qq gettext git
   script:
     - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - ../dev-tools/locale-scripts/fusiondirectory-update-locale -g
 
 # Update transifex
 update-transifex:
+  image: php:cli-stretch
   stage: transifex
   only:
     - /^1.*$/
   before_script:
     - apt-get update -qq
-    - apt-get install -y -qq gettext git php-cli transifex-client
+    - apt-get install -y -qq gettext git transifex-client
   script:
     - git clone https://gitlab.fusiondirectory.org/fusiondirectory/dev-tools.git ../dev-tools
     - echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
-- 
GitLab