From 38b7815ddfa5e782c72a7966467d1a5175ab60d1 Mon Sep 17 00:00:00 2001 From: kseremet Date: Sat, 26 Jan 2019 21:54:56 +0300 Subject: [PATCH 1/2] Update bower.json --- web-nodejs/bower.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web-nodejs/bower.json b/web-nodejs/bower.json index f2ca76c..a787458 100644 --- a/web-nodejs/bower.json +++ b/web-nodejs/bower.json @@ -17,6 +17,7 @@ }, "resolutions": { "angular": "1.5.10", - "jquery": "3.2.1" + "jquery": "3.2.1", + "bootstrap": "~3.3.7" } -} \ No newline at end of file +} From 3f981e8389f5b50afd1eebcca2485ac8712a716a Mon Sep 17 00:00:00 2001 From: kseremet Date: Sun, 3 Mar 2019 21:16:15 +0300 Subject: [PATCH 2/2] Create Jenkinsfile --- cart-spring-boot/Jenkinsfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 cart-spring-boot/Jenkinsfile diff --git a/cart-spring-boot/Jenkinsfile b/cart-spring-boot/Jenkinsfile new file mode 100644 index 0000000..e0c4064 --- /dev/null +++ b/cart-spring-boot/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent { + label 'maven' + } + stages { + stage('Checkout App Source') { + git url: 'https://github.com/kseremet/devops-labs.git' + } + stage('Build App') { + steps { + sh "cd cart-spring-boot" + sh "mvn clean package -s src/main/config/settings.xml" + } + } + stage('Build Image') { + steps { + script { + openshift.withCluster() { + openshift.withProject() { + openshift.startBuild("cart", "--from-file=target/cart.jar").logs("-f") + } + } + } + } + } + } +}