diff options
author | 2017-08-22 16:38:56 +0000 | |
---|---|---|
committer | 2017-08-22 16:38:56 +0000 | |
commit | 362f29f5f802e0f9c328d8f4fcad46fcbc567bf7 (patch) | |
tree | 47af1ab1d86390d6f3edfd33a55386f1827dbfc9 /jjb | |
parent | 041644f788f2112312e22c595ef1b8f4867590d0 (diff) | |
parent | d01c1deb155498ba8e1728648e2284f8afd7f0c8 (diff) |
Merge "Jenkis job for apigateway and discovery dockers"
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/msb/build-apigateway-docker-image.sh (renamed from jjb/msb/build-docker-image.sh) | 0 | ||||
-rw-r--r-- | jjb/msb/build-discovery-docker-image.sh | 11 | ||||
-rw-r--r-- | jjb/msb/msb-apigateway.yaml | 2 | ||||
-rw-r--r-- | jjb/msb/msb-discovery.yaml | 6 |
4 files changed, 17 insertions, 2 deletions
diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-apigateway-docker-image.sh index 6ca48a2c7..6ca48a2c7 100644 --- a/jjb/msb/build-docker-image.sh +++ b/jjb/msb/build-apigateway-docker-image.sh diff --git a/jjb/msb/build-discovery-docker-image.sh b/jjb/msb/build-discovery-docker-image.sh new file mode 100644 index 000000000..ae7f5a275 --- /dev/null +++ b/jjb/msb/build-discovery-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 *.* + +./build4docker.sh + diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 54f178562..69042cb5f 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -14,7 +14,7 @@ docker-pom: 'pom.xml' mvn-goals: 'install' script: - !include-raw-escape: 'build-docker-image.sh' + !include-raw-escape: 'build-apigateway-docker-image.sh' project: 'msb/apigateway' stream: diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index f35572caa..bb20c4b03 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -10,7 +10,11 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-discovery-docker-image.sh' project: 'msb/discovery' stream: - 'master': |