From ac76994a7005085e10c6d62b2d4613194b0cc577 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Mon, 25 Jul 2016 12:18:51 -0400 Subject: [PATCH] Attempt moving config file in a different way --- .gitlab-ci.yml | 2 ++ build/docker_install.sh | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78229a40..c64b9fb2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,8 @@ before_script: # Install composer dependencies - curl -sS https://getcomposer.org/installer | php - php composer.phar install + # Move redis test config file into place + - mv "./tests/redis.toml" "./app/config/redis.toml" # Composer stores all downloaded packages in the vendor/ directory. # Do not use the following if the vendor/ directory is commited to diff --git a/build/docker_install.sh b/build/docker_install.sh index 42ac246f..7dca9c3f 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -16,10 +16,6 @@ apt-get install git unzip libfreetype6 libjpeg62-turbo libmcrypt4 libpng12-0 lib curl -Lo /usr/local/bin/phpunit https://phar.phpunit.de/phpunit.phar chmod +x /usr/local/bin/phpunit -# Move redis test config file into place -mv "$DIR/tests/redis.toml" "$DIR/app/config/redis.toml" - - # Install gd docker-php-ext-configure gd --enable-gd-native-ttf --with-jpeg-dir=/usr/lib/x86_64-linux-gnu --with-png-dir=/usr/lib/x86_64-linux-gnu --with-freetype-dir=/usr/lib/x86_64-linux-gnu docker-php-ext-install gd