From 5d5136d838072696c6d9cce9ccfcba8dba3f170d Mon Sep 17 00:00:00 2001 From: Imransysg Date: Wed, 26 Jul 2017 10:30:23 +0530 Subject: [PATCH 01/54] Delete docker-compose.yml --- docker-compose.yml | 42 ------------------------------------------ 1 file changed, 42 deletions(-) delete mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 91c3aba05f..0000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: "2" - -services: - voting-app: - image: dtrnodednstpal2zkqvglmc.westus.cloudapp.azure.com/admin/vote:latest - ports: - - "80" - networks: - - voteapp - labels: - - "interlock.hostname=vote" - - "interlock.domain=myenterprise.com" - result-app: - image: dtrnodednstpal2zkqvglmc.westus.cloudapp.azure.com/admin/result:latest - ports: - - "80" - networks: - - voteapp - labels: - - "interlock.hostname=results" - - "interlock.domain=myenterprise.com" - worker: - image: dtrnodednstpal2zkqvglmc.westus.cloudapp.azure.com/admin/worker:latest - networks: - - voteapp - redis: - image: redis - ports: - - "6379" - networks: - - voteapp - db: - image: postgres:9.4 - volumes: - - "db-data:/var/lib/postgresql/data" - networks: - - voteapp -volumes: - db-data: - -networks: - voteapp: From de349511a8aac03bfb49ed7e786147d06ad00936 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Wed, 26 Jul 2017 10:30:47 +0530 Subject: [PATCH 02/54] Add files via upload --- docker-compose3.yml | 81 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 docker-compose3.yml diff --git a/docker-compose3.yml b/docker-compose3.yml new file mode 100644 index 0000000000..04f6385991 --- /dev/null +++ b/docker-compose3.yml @@ -0,0 +1,81 @@ +version: "3" +services: + + redis: + image: redis:alpine + ports: + - "6379" + networks: + - frontend + deploy: + replicas: 2 + update_config: + parallelism: 2 + delay: 10s + restart_policy: + condition: on-failure + db: + image: postgres:9.4 + volumes: + - db-data:/var/lib/postgresql/data + networks: + - backend + deploy: + placement: + constraints: [node.role == manager] + vote: + image: dtrlb-oe3ko7eumonjw.eastus.cloudapp.azure.com/ddcadmin/voting-app-vote:latest + ports: + - 5000:80 + networks: + - frontend + depends_on: + - redis + deploy: + replicas: 6 + update_config: + parallelism: 2 + restart_policy: + condition: on-failure + result: + image: dtrlb-oe3ko7eumonjw.eastus.cloudapp.azure.com/ddcadmin/voting-app-result:latest + ports: + - 5001:80 + networks: + - backend + deploy: + replicas: 2 + update_config: + parallelism: 2 + delay: 10s + restart_policy: + condition: on-failure + + worker: + image: dtrlb-oe3ko7eumonjw.eastus.cloudapp.azure.com/ddcadmin/voting-app-worker:latest + networks: + - frontend + - backend + deploy: + mode: replicated + replicas: 2 + labels: [APP=VOTING] + restart_policy: + condition: on-failure + delay: 10s + max_attempts: 3 + window: 120s + placement: + constraints: [node.role == worker] + ports: + - "8080:8080" + stop_grace_period: 1m30s + volumes: + - "/var/run/docker.sock:/var/run/docker.sock" + +networks: + frontend: + backend: + +volumes: + db-data: \ No newline at end of file From d7c3b103a823f3031fbb273477f298cca037d6f4 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Wed, 26 Jul 2017 10:31:03 +0530 Subject: [PATCH 03/54] Rename docker-compose3.yml to docker-compose.yml --- docker-compose3.yml => docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename docker-compose3.yml => docker-compose.yml (94%) diff --git a/docker-compose3.yml b/docker-compose.yml similarity index 94% rename from docker-compose3.yml rename to docker-compose.yml index 04f6385991..7b17e38d8c 100644 --- a/docker-compose3.yml +++ b/docker-compose.yml @@ -78,4 +78,4 @@ networks: backend: volumes: - db-data: \ No newline at end of file + db-data: From 6cb4a3e2487da8a2d0326d20e997c24f66e383ec Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:06:28 +0530 Subject: [PATCH 04/54] Update job.groovy --- job.groovy | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/job.groovy b/job.groovy index acf9bbc371..c08bb853b7 100644 --- a/job.groovy +++ b/job.groovy @@ -1,12 +1,17 @@ -node{ - - docker.withRegistry('https://dtrnodednsitqp7hrth6jf2.westus.cloudapp.azure.com/', 'ddc-dtr-login') { - git 'https://github.com/SattaRavi/example-voting-app.git' - - build 'Job-Result' - build 'Job-Vote' - build 'Job-Worker' - +node +{ + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + // dtr-login is a login ID in credentials + stage "syncing files" + git 'https://github.com/sysgain/example-voting-app.git' + + stage "Building and pushing Vote Image" + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + + stage "Building and pushing Worker Image" + def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') + + stage "Building and pushing Result Image" + def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') } - } From 724b8471e272352466903d0c53643bdd679b837f Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:07:08 +0530 Subject: [PATCH 05/54] Rename job.groovy to jenkinsfile --- job.groovy => jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename job.groovy => jenkinsfile (100%) diff --git a/job.groovy b/jenkinsfile similarity index 100% rename from job.groovy rename to jenkinsfile From 4aa9fb7f2faa1fac2397490a3b47df87a62153f5 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:10:24 +0530 Subject: [PATCH 06/54] Added Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..e2944079df --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { + dockerfile { + filename 'Dockerfile' + } + + } + stages { + stage('Test') { + steps { + sh 'ls' + } + } + } +} \ No newline at end of file From b17d6fd4a29f0570cafa686db00898109acc4da6 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:12:24 +0530 Subject: [PATCH 07/54] Added Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2944079df..23c8384ce3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - dockerfile { - filename 'Dockerfile' - } - - } + agent none stages { stage('Test') { steps { From a3b67600a69546c495f43da54f6f990b9b003226 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:13:09 +0530 Subject: [PATCH 08/54] Added Jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23c8384ce3..a579595758 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent none + agent { + node { + label 'abc' + } + + } stages { stage('Test') { steps { From 4537a9e0841c44043a0fb9d0dd3960e8ba34579c Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:15:51 +0530 Subject: [PATCH 09/54] Added Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a579595758..23c8384ce3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - node { - label 'abc' - } - - } + agent none stages { stage('Test') { steps { From 08d2110f1e99cc258d36dd59f7b4e431ba09f7f2 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:31:57 +0530 Subject: [PATCH 10/54] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 23c8384ce3..3e79fc6036 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent none + agent any stages { stage('Test') { steps { From 42049ada980c8bc24df045a0170e8399dfece31e Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:35:27 +0530 Subject: [PATCH 11/54] Added Jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e79fc6036..24fc7d3313 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent any + agent { + dockerfile { + filename 'vote' + } + + } stages { stage('Test') { steps { From 4c76471649babdcd1018549375fba99b2cd8fea1 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 13:36:13 +0530 Subject: [PATCH 12/54] Added Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 24fc7d3313..3e79fc6036 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,5 @@ pipeline { - agent { - dockerfile { - filename 'vote' - } - - } + agent any stages { stage('Test') { steps { From 1a61a5a3577cf335f6e3dce2c984167f3636fbac Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 15:36:49 +0530 Subject: [PATCH 13/54] Delete Jenkinsfile --- Jenkinsfile | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3e79fc6036..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,10 +0,0 @@ -pipeline { - agent any - stages { - stage('Test') { - steps { - sh 'ls' - } - } - } -} \ No newline at end of file From cee0b2bf4f5806dcb8aa5f6a143639deca649fe6 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Fri, 20 Oct 2017 15:38:06 +0530 Subject: [PATCH 14/54] Rename jenkinsfile to Jenkinsfile --- jenkinsfile => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkinsfile => Jenkinsfile (100%) diff --git a/jenkinsfile b/Jenkinsfile similarity index 100% rename from jenkinsfile rename to Jenkinsfile From 05d41c633e898df23881df0e4ffff2c7771d83f7 Mon Sep 17 00:00:00 2001 From: knagababu <30715079+knagababu@users.noreply.github.com> Date: Thu, 2 Nov 2017 12:32:38 +0530 Subject: [PATCH 15/54] Update Jenkinsfile --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c08bb853b7..c06962fc4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,3 +15,6 @@ node def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') } } + + + From aface6aba225780f173dc609920fd3b24cccac7f Mon Sep 17 00:00:00 2001 From: knagababu <30715079+knagababu@users.noreply.github.com> Date: Thu, 2 Nov 2017 12:34:26 +0530 Subject: [PATCH 16/54] deleted for test --- Jenkinsfile | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index c06962fc4a..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,20 +0,0 @@ -node -{ - docker.withRegistry('https://10.1.53.4/','dtr-login'){ - // dtr-login is a login ID in credentials - stage "syncing files" - git 'https://github.com/sysgain/example-voting-app.git' - - stage "Building and pushing Vote Image" - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') - - stage "Building and pushing Worker Image" - def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') - - stage "Building and pushing Result Image" - def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') - } -} - - - From b53490c71cbf5a8a16ddd8d050be48dae02195d1 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 12:42:14 +0530 Subject: [PATCH 17/54] syncing files --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..205509abad --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,10 @@ +pipeline { + agent any + stages { + stage('syncing files') { + steps { + sh 'git \'https://github.com/reshma-k/example-voting-app.git/\'' + } + } + } +} \ No newline at end of file From b31ec232c40bb08c47f1840cc5a9b4dd94d56fe2 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 12:43:17 +0530 Subject: [PATCH 18/54] modified --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 205509abad..9bd099e9e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { stages { stage('syncing files') { steps { - sh 'git \'https://github.com/reshma-k/example-voting-app.git/\'' + sh 'https://github.com/Imransysg/example-voting-app' } } } From 216de4eed69b15b30aefccf8a351f2f902cd34ec Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 12:45:30 +0530 Subject: [PATCH 19/54] git path added --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9bd099e9e1..e9c86bcb45 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ pipeline { stages { stage('syncing files') { steps { - sh 'https://github.com/Imransysg/example-voting-app' + load 'git \'https://github.com/reshma-k/example-voting-app.git/\'' } } } From 3fbb257463c05b3758aa6020ec086c929d6b65db Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:00:27 +0530 Subject: [PATCH 20/54] syncing files --- Jenkinsfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e9c86bcb45..902ee3825d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,17 @@ pipeline { stages { stage('syncing files') { steps { - load 'git \'https://github.com/reshma-k/example-voting-app.git/\'' + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + // dtr-login is a login ID in credentials + stage "syncing files" + git 'https://github.com/Imransysg/example-voting-app.git/' + } + } + } + } } } From 82c3534dfc17d2346a8ffd0a7981d7f744f7dba3 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:02:41 +0530 Subject: [PATCH 21/54] testfor jenkins file --- Jenkinsfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 902ee3825d..8f92eb33e7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any stages { - stage('syncing files') { + stage('') { steps { script { node @@ -9,7 +9,16 @@ pipeline { docker.withRegistry('https://10.1.53.4/','dtr-login'){ // dtr-login is a login ID in credentials stage "syncing files" - git 'https://github.com/Imransysg/example-voting-app.git/' + git 'https://github.com/reshma-k/example-voting-app.git/' + + stage "Building and pushing Vote Image" + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + + stage "Building and pushing Worker Image" + def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') + + stage "Building and pushing Result Image" + def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') } } } From 4fb183fc010d1fd219988560359aa09a12e3911f Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:10:04 +0530 Subject: [PATCH 22/54] initial commit --- Jenkinsfile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f92eb33e7..902ee3825d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent any stages { - stage('') { + stage('syncing files') { steps { script { node @@ -9,16 +9,7 @@ pipeline { docker.withRegistry('https://10.1.53.4/','dtr-login'){ // dtr-login is a login ID in credentials stage "syncing files" - git 'https://github.com/reshma-k/example-voting-app.git/' - - stage "Building and pushing Vote Image" - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') - - stage "Building and pushing Worker Image" - def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') - - stage "Building and pushing Result Image" - def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + git 'https://github.com/Imransysg/example-voting-app.git/' } } } From 928b9284258645a1de1d8c31cdbbec4c00eefa05 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:11:42 +0530 Subject: [PATCH 23/54] modified --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 902ee3825d..a21f197c1a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { { docker.withRegistry('https://10.1.53.4/','dtr-login'){ // dtr-login is a login ID in credentials - stage "syncing files" + git 'https://github.com/Imransysg/example-voting-app.git/' } } From c26e75f90db465bc3e0b51d2eda391d25810ce86 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:15:55 +0530 Subject: [PATCH 24/54] building and pushing --- Jenkinsfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a21f197c1a..f77739c458 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,5 +16,22 @@ pipeline { } } + stage('') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + + + git 'https://github.com/Imransysg/example-voting-app.git/' + stage "Building and pushing Vote Image" + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + } + } + } + + } + } } } \ No newline at end of file From 1b6e3541c2fbcd10548a02f308b7074dcbcadbf6 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:18:01 +0530 Subject: [PATCH 25/54] modified --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f77739c458..7ffd586e54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { } } - stage('') { + stage('Building and pushing Vote Image') { steps { script { node @@ -25,7 +25,7 @@ pipeline { git 'https://github.com/Imransysg/example-voting-app.git/' - stage "Building and pushing Vote Image" + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') } } From cd95bbd31f3e7b34e94086709fb6450be9efd15f Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:21:17 +0530 Subject: [PATCH 26/54] Building and pushing Worker Image --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7ffd586e54..a24c10dc5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,5 +33,20 @@ pipeline { } } + stage('Building and pushing Worker Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + + git 'https://github.com/Imransysg/example-voting-app.git/' + def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') + } + } + } + + } + } } } \ No newline at end of file From d33d5f662d01d68d0703f6c4455bbb0c8fa82ada Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:23:32 +0530 Subject: [PATCH 27/54] app result --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a24c10dc5c..5706970656 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,5 +48,13 @@ pipeline { } } + stage('Building and pushing Result Image') { + steps { + script { + def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + } + + } + } } } \ No newline at end of file From 0da232ba7a0415d23799b2de8f2ae219f6b26edb Mon Sep 17 00:00:00 2001 From: Imransysg Date: Thu, 2 Nov 2017 13:25:33 +0530 Subject: [PATCH 28/54] final changes done --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5706970656..1163cd0a44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,7 +51,13 @@ pipeline { stage('Building and pushing Result Image') { steps { script { - def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + + def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + } + } } } From df57d81a428a410ec6e7485b97278a20994d00cd Mon Sep 17 00:00:00 2001 From: knagababu <30715079+knagababu@users.noreply.github.com> Date: Mon, 6 Nov 2017 15:49:48 +0530 Subject: [PATCH 29/54] deleted by nagababu --- Jenkinsfile | 66 ----------------------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 1163cd0a44..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,66 +0,0 @@ -pipeline { - agent any - stages { - stage('syncing files') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ - // dtr-login is a login ID in credentials - - git 'https://github.com/Imransysg/example-voting-app.git/' - } - } - } - - } - } - stage('Building and pushing Vote Image') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ - - - git 'https://github.com/Imransysg/example-voting-app.git/' - - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') - } - } - } - - } - } - stage('Building and pushing Worker Image') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ - - git 'https://github.com/Imransysg/example-voting-app.git/' - def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') - } - } - } - - } - } - stage('Building and pushing Result Image') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ - - def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') - } - } - } - - } - } - } -} \ No newline at end of file From c99bb6fefa38ceac28783c4d3527d6c93bc0f015 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 16:11:58 +0530 Subject: [PATCH 30/54] syncing files --- Jenkinsfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..913627e29d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent any + stages { + stage('syncing files') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + git 'https://github.com/Imransysg/example-voting-app.git/' + + } + } + } + + } + } + } +} \ No newline at end of file From ae084ab0abff49868ab4446c4c0aded49a3a8c21 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 16:13:40 +0530 Subject: [PATCH 31/54] Building and pushing Vote Image --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 913627e29d..31272d5fe0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,5 +15,19 @@ pipeline { } } + stage('Building and pushing Vote Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + git 'https://github.com/Imransysg/example-voting-app.git/' + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + } + } + } + + } + } } } \ No newline at end of file From 0c133611147cdb34d5f02770397c4fc5a3565504 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 16:17:27 +0530 Subject: [PATCH 32/54] modified the source code From e08fe05f33a4ac4bf85cd9946487443bceb82859 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 16:24:28 +0530 Subject: [PATCH 33/54] commites done --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 31272d5fe0..8c04d03876 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,10 @@ pipeline { node { docker.withRegistry('https://10.1.53.4/','dtr-login'){ + // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + } } } From 5429cd3788a6c55525077d8e0617c1fabec7d551 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 16:26:55 +0530 Subject: [PATCH 34/54] code commit From b9a48c6d09a55d28ff799a8d0870b5443038b6d8 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 17:28:14 +0530 Subject: [PATCH 35/54] ip has changed --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8c04d03876..57d625e373 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ + docker.withRegistry('https://10.1.53.13/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') From 8777b195f0f864e6ea64e27d2689a8d9ce87acbe Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 17:35:47 +0530 Subject: [PATCH 36/54] ip changed --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57d625e373..8c04d03876 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ + docker.withRegistry('https://10.1.53.4/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') From d26e30f732ad2be869972ad022081bc09f810e12 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 17:37:03 +0530 Subject: [PATCH 37/54] new ip updated --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8c04d03876..57d625e373 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ + docker.withRegistry('https://10.1.53.13/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') From 282c2b44e748532b002e783cf16436d28dcb47a7 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 17:46:55 +0530 Subject: [PATCH 38/54] ip updated --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57d625e373..e6a2e6e115 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ + docker.withRegistry('https://10.1.53.13/','dtr-login'){ git 'https://github.com/Imransysg/example-voting-app.git/' } From 124544b93eeaf547728527b5d560dbf16153aa5f Mon Sep 17 00:00:00 2001 From: Imransysg Date: Mon, 6 Nov 2017 17:56:46 +0530 Subject: [PATCH 39/54] ipchanged again From 3099b57ca53f9fee02affb11db160f10d1fe5877 Mon Sep 17 00:00:00 2001 From: knagababu <30715079+knagababu@users.noreply.github.com> Date: Tue, 7 Nov 2017 16:21:33 +0530 Subject: [PATCH 40/54] deleted jenkins file --- Jenkinsfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index e6a2e6e115..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,35 +0,0 @@ -pipeline { - agent any - stages { - stage('syncing files') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ - git 'https://github.com/Imransysg/example-voting-app.git/' - - } - } - } - - } - } - stage('Building and pushing Vote Image') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ - // dtr-login is a login ID in credentials - git 'https://github.com/Imransysg/example-voting-app.git/' - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') - - } - } - } - - } - } - } -} \ No newline at end of file From 5d90129631989e1c8402fe0eaed7a93b3529ef3c Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:24:24 +0530 Subject: [PATCH 41/54] created Jenkins file on master branch --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..08026fb1fd --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + stages { + stage('syncing files') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.4/','dtr-login'){ + // dtr-login is a login ID in credentials + git 'https://github.com/Imransysg/example-voting-app.git/' + + } + + } + } + + } + } + } +} \ No newline at end of file From 05c5cff283cd2e93602ab234c95b42bda5f6188d Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:28:12 +0530 Subject: [PATCH 42/54] add the script on jenkins file --- Jenkinsfile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08026fb1fd..e7939b02e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.4/','dtr-login'){ + docker.withRegistry('https://10.1.53.13/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' @@ -17,5 +17,21 @@ pipeline { } } + stage('Vote Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login') + { + git 'https://github.com/Imransysg/example-voting-app.git/' + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + } + + } + } + + } + } } } \ No newline at end of file From 6fb58b5c1c8dd43fa203938b22938c6266859bcf Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:34:09 +0530 Subject: [PATCH 43/54] add worker image in Jenkins pipeline --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index e7939b02e4..fe6ccd75af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,5 +33,21 @@ pipeline { } } + stage('Worker Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login'){ + git 'https://github.com/Imransysg/example-voting-app.git/' + def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') + + } + + } + } + + } + } } } \ No newline at end of file From 920d182d5ec15019eadb82363e7d857039f9fe28 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:37:32 +0530 Subject: [PATCH 44/54] added result image on a Jenkins file in master --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index fe6ccd75af..dfdcbedb93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,5 +49,21 @@ pipeline { } } + stage('Result Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login'){ + // dtr-login is a login ID in credentials + git 'https://github.com/Imransysg/example-voting-app.git/' + def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + + } + } + } + + } + } } } \ No newline at end of file From 61eafe8bb9556de4ecddd50f4419cf959b97b294 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:40:39 +0530 Subject: [PATCH 45/54] created new branch in blue ocean --- Jenkinsfile | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dfdcbedb93..dab39e8ce5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,19 +18,28 @@ pipeline { } } stage('Vote Image') { - steps { - script { - node - { - docker.withRegistry('https://10.1.53.13/','dtr-login') - { - git 'https://github.com/Imransysg/example-voting-app.git/' - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + parallel { + stage('Vote Image') { + steps { + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login') + { + git 'https://github.com/Imransysg/example-voting-app.git/' + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + } + + } } } } - + stage('alpha') { + steps { + echo 'alpha' + } + } } } stage('Worker Image') { From 0634a7f19dd4209c6a0e7232fc9eb24dabea23d2 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:44:21 +0530 Subject: [PATCH 46/54] created stg branch on example votingapp --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index dab39e8ce5..f20e1b091b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,11 @@ pipeline { echo 'alpha' } } + stage('stg') { + steps { + echo 'stg' + } + } } } stage('Worker Image') { From 3d05a9455858b1bc3a91a309367e1f761874c250 Mon Sep 17 00:00:00 2001 From: knagababu <30715079+knagababu@users.noreply.github.com> Date: Tue, 7 Nov 2017 16:46:25 +0530 Subject: [PATCH 47/54] commited by nagababu --- vote/testfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 vote/testfile diff --git a/vote/testfile b/vote/testfile new file mode 100644 index 0000000000..01f53679a3 --- /dev/null +++ b/vote/testfile @@ -0,0 +1 @@ +hi this is test for blue ocean plugin From 5458ae2ddb34e5cd5c88058d4809e78e4926cd92 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:50:37 +0530 Subject: [PATCH 48/54] updated script --- Jenkinsfile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f20e1b091b..5e8ea80b9a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,19 @@ pipeline { } stage('stg') { steps { - echo 'stg' + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login'){ + // dtr-login is a login ID in credentials + + git 'https://github.com/Imransysg/example-voting-app.git/' + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + + } + } + } + } } } From 987457afe7c21fc9c0e01706f5fca1db4fe8f8ad Mon Sep 17 00:00:00 2001 From: Imransysg Date: Tue, 7 Nov 2017 16:55:42 +0530 Subject: [PATCH 49/54] change script --- Jenkinsfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5e8ea80b9a..920fe838c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,20 @@ pipeline { stage('alpha') { steps { echo 'alpha' + script { + node + { + docker.withRegistry('https://10.1.53.13/','dtr-login'){ + // dtr-login is a login ID in credentials + git 'https://github.com/Imransysg/example-voting-app.git/' + + def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + + } + + } + } + } } stage('stg') { From 93e14a93f8038cc46568e5cfef85ffeacbba7bb6 Mon Sep 17 00:00:00 2001 From: Imransysg Date: Wed, 8 Nov 2017 11:27:59 +0530 Subject: [PATCH 50/54] stg branch edited --- Jenkinsfile | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 920fe838c9..4d659fb827 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,25 +35,6 @@ pipeline { } } - stage('alpha') { - steps { - echo 'alpha' - script { - node - { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ - // dtr-login is a login ID in credentials - git 'https://github.com/Imransysg/example-voting-app.git/' - - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') - - } - - } - } - - } - } stage('stg') { steps { script { From 39adcb49253b38bab526b4fcfd06a7f2667b7904 Mon Sep 17 00:00:00 2001 From: Mohammed Imran Date: Thu, 23 Nov 2017 12:22:05 +0530 Subject: [PATCH 51/54] updated url --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4d659fb827..7385331ad1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login') + docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login') { git 'https://github.com/Imransysg/example-voting-app.git/' def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') From c19ccd9efb1536e461ed58df9e22efdcbd97ef9f Mon Sep 17 00:00:00 2001 From: Mohammed Imran Date: Thu, 23 Nov 2017 12:23:51 +0530 Subject: [PATCH 52/54] updated url in all branches --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7385331ad1..747733c148 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ + docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' @@ -40,7 +40,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ + docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' @@ -59,7 +59,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ + docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ git 'https://github.com/Imransysg/example-voting-app.git/' def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') @@ -75,7 +75,7 @@ pipeline { script { node { - docker.withRegistry('https://10.1.53.13/','dtr-login'){ + docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') From af36a479116a40e0c8f78bfeaf895d3a63f8b104 Mon Sep 17 00:00:00 2001 From: Mohammed Imran Date: Thu, 23 Nov 2017 12:29:17 +0530 Subject: [PATCH 53/54] chagned username and url --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 747733c148..3dbdf5fcad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login') { git 'https://github.com/Imransysg/example-voting-app.git/' - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + def vote_img = docker.build('ddcadmin/voting-app-vote','./vote').push('latest') } } @@ -44,7 +44,7 @@ pipeline { // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' - def vote_img = docker.build('dockeradmin/voting-app-vote','./vote').push('latest') + def vote_img = docker.build('ddcadmin/voting-app-vote','./vote').push('latest') } } @@ -61,7 +61,7 @@ pipeline { { docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ git 'https://github.com/Imransysg/example-voting-app.git/' - def worker_img = docker.build('dockeradmin/voting-app-worker','./worker').push('latest') + def worker_img = docker.build('ddcadmin/voting-app-worker','./worker').push('latest') } @@ -78,7 +78,7 @@ pipeline { docker.withRegistry('https://dtrlb-adockersb.westus.cloudapp.azure.com/','dtr-login'){ // dtr-login is a login ID in credentials git 'https://github.com/Imransysg/example-voting-app.git/' - def result_img = docker.build('dockeradmin/voting-app-result','./result').push('latest') + def result_img = docker.build('ddcadmin/voting-app-result','./result').push('latest') } } From c60c96bba722e9cda1934bc2a39a1f2da72ea2a1 Mon Sep 17 00:00:00 2001 From: Mohammed Imran Date: Thu, 23 Nov 2017 12:32:38 +0530 Subject: [PATCH 54/54] Added Jenkinsfile