From e3aed4f17c11a5604fcc14561deb7bc61f097336 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Mon, 1 Feb 2016 21:44:56 +0100
Subject: [PATCH] Fix images

---
 docker/scripts/fetch-pr.sh         | 7 ++++++-
 docker/scripts/generate-archive.sh | 2 +-
 docker/scripts/prepare-sources.sh  | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docker/scripts/fetch-pr.sh b/docker/scripts/fetch-pr.sh
index 29004ef537..8d2b8bcd98 100755
--- a/docker/scripts/fetch-pr.sh
+++ b/docker/scripts/fetch-pr.sh
@@ -4,4 +4,9 @@ docker run \
     --user $(id -u):$(id -g) \
     --volume ${WORKING_DIR}:/data \
     --workdir /data \
-    phpbb/build${IMAGES_TAG} sh -c 'git remote set-url origin "https://github.com/phpbb/phpbb.git" && git fetch origin +refs/pull/'${PR_NUMBER}'/merge && git checkout FETCH_HEAD'
+    phpbb/build${IMAGES_TAG} sh -c '
+    git config user.email "no-reply@phpbb.com" &&
+    git config user.name "phpBB CI" &&
+    git remote set-url origin "https://github.com/phpbb/phpbb.git" &&
+    git fetch origin +refs/pull/'${PR_NUMBER}'/merge &&
+    git checkout FETCH_HEAD'
diff --git a/docker/scripts/generate-archive.sh b/docker/scripts/generate-archive.sh
index e78d6ec14b..d754afcf00 100755
--- a/docker/scripts/generate-archive.sh
+++ b/docker/scripts/generate-archive.sh
@@ -12,6 +12,6 @@ docker run \
     --user $(id -u):$(id -g) \
     --volume ${WORKING_DIR}:/data \
     --workdir /data \
-    phpbb/build{IMAGES_TAG} sh generate-archive.sh
+    phpbb/build${IMAGES_TAG} sh generate-archive.sh
 
 rm generate-archive.sh
diff --git a/docker/scripts/prepare-sources.sh b/docker/scripts/prepare-sources.sh
index c45046fa59..6202a6ede8 100755
--- a/docker/scripts/prepare-sources.sh
+++ b/docker/scripts/prepare-sources.sh
@@ -6,17 +6,17 @@ docker run \
     --volume ${WORKING_DIR}:/data \
     --volume ${COMPOSER_HOME}:/composer/ \
     --workdir /data \
-    phpbb/build{IMAGES_TAG} sh -c "COMPOSER_HOME=/composer php composer.phar config -g github-oauth.github.com ${GITHUB_TOKEN}"
+    phpbb/build${IMAGES_TAG} sh -c "COMPOSER_HOME=/composer php composer.phar config -g github-oauth.github.com ${GITHUB_TOKEN}"
 
 docker run \
     --user $(id -u):$(id -g) \
     --volume ${WORKING_DIR}:/data \
     --volume ${COMPOSER_HOME}:/composer/ \
     --workdir /data \
-    phpbb/build{IMAGES_TAG} sh -c 'cd phpBB; COMPOSER_HOME=/composer php ../composer.phar install --dev'
+    phpbb/build${IMAGES_TAG} sh -c 'cd phpBB; COMPOSER_HOME=/composer php ../composer.phar install --dev'
 
 docker run \
     --user $(id -u):$(id -g) \
     --volume ${WORKING_DIR}:/data \
     --workdir /data \
-    phpbb/build{IMAGES_TAG} sh -c 'cd build; ../phpBB/vendor/bin/phing clean prepare'
+    phpbb/build${IMAGES_TAG} sh -c 'cd build; ../phpBB/vendor/bin/phing clean prepare'