4.1 Beta...ish #12

Merged
timw4mail merged 88 commits from develop into master 2018-11-05 13:15:59 -05:00
2 changed files with 6 additions and 6 deletions
Showing only changes of commit 762bdba724 - Show all commits

8
Jenkinsfile vendored
View File

@ -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'

View File

@ -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