From 762bdba724dd7f2f55a021fa7ff7f9e88157a00a Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Thu, 11 Oct 2018 13:06:58 -0400 Subject: [PATCH] Update shell script for Jenkins --- Jenkinsfile | 8 ++++---- build/docker_install.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5b988b0c..1a96f880 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,8 +6,8 @@ pipeline { docker { image 'php:7.1-alpine' } } steps { - sh 'chmod +x build/docker_install.sh' - sh 'build/docker_install.sh' + sh 'chmod +x ./build/docker_install.sh' + sh 'sh build/docker_install.sh' sh 'apk add --no-cache php7-phpdbg' sh 'curl -sS https://getcomposer.org/installer | php' sh 'php composer.phar install --ignore-platform-reqs' @@ -19,8 +19,8 @@ pipeline { docker { image 'php:7.2-alpine' } } steps { - sh 'chmod +x build/docker_install.sh' - sh 'build/docker_install.sh' + sh 'chmod +x ./build/docker_install.sh' + sh 'sh build/docker_install.sh' sh 'apk add --no-cache php7-phpdbg' sh 'curl -sS https://getcomposer.org/installer | php' sh 'php composer.phar install --ignore-platform-reqs' diff --git a/build/docker_install.sh b/build/docker_install.sh index 7ddee016..73163966 100644 --- a/build/docker_install.sh +++ b/build/docker_install.sh @@ -6,7 +6,7 @@ set -xe # Install git (the php image doesn't have it) which is required by composer -echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories -apk add --no-cache \ +# echo -e 'http://dl-cdn.alpinelinux.org/alpine/edge/main\nhttp://dl-cdn.alpinelinux.org/alpine/edge/community\nhttp://dl-cdn.alpinelinux.org/alpine/edge/testing' > /etc/apk/repositories +apk --update add --no-cache \ curl \ git