Browse Source

Update shell script for Jenkins

Timothy J. Warren 1 month ago
parent
commit
762bdba724
2 changed files with 6 additions and 6 deletions
  1. 4
    4
      Jenkinsfile
  2. 2
    2
      build/docker_install.sh

+ 4
- 4
Jenkinsfile View File

@@ -6,8 +6,8 @@ pipeline {
6 6
 				docker { image 'php:7.1-alpine' }
7 7
 			}
8 8
 			steps {
9
-				sh 'chmod +x build/docker_install.sh'
10
-				sh 'build/docker_install.sh'
9
+				sh 'chmod +x ./build/docker_install.sh'
10
+				sh 'sh build/docker_install.sh'
11 11
 				sh 'apk add --no-cache php7-phpdbg'
12 12
 				sh 'curl -sS https://getcomposer.org/installer | php'
13 13
 				sh 'php composer.phar install --ignore-platform-reqs'
@@ -19,8 +19,8 @@ pipeline {
19 19
 				docker { image 'php:7.2-alpine' }
20 20
 			}
21 21
 			steps {
22
-				sh 'chmod +x build/docker_install.sh'
23
-				sh 'build/docker_install.sh'
22
+				sh 'chmod +x ./build/docker_install.sh'
23
+				sh 'sh build/docker_install.sh'
24 24
 				sh 'apk add --no-cache php7-phpdbg'
25 25
 				sh 'curl -sS https://getcomposer.org/installer | php'
26 26
 				sh 'php composer.phar install --ignore-platform-reqs'

+ 2
- 2
build/docker_install.sh View File

@@ -6,7 +6,7 @@
6 6
 set -xe
7 7
 
8 8
 # Install git (the php image doesn't have it) which is required by composer
9
-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
10
-apk add --no-cache \
9
+# 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
10
+apk --update add --no-cache \
11 11
 	curl \
12 12
 	git