From 4454ae3c40790755299791b8f707a99f875272f9 Mon Sep 17 00:00:00 2001 From: danhakin Date: Thu, 3 May 2018 16:14:59 +0200 Subject: [PATCH 1/4] Added initial Jenkinsfile --- Jenkinsfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..2b6476817e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,15 @@ +pipeline { + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000' + } + } + stages { + stage('Build') { + steps { + sh 'npm install' + } + } + } +} \ No newline at end of file From fb0de8975837539e51a5efd0afbab23f3b6fa3ee Mon Sep 17 00:00:00 2001 From: danhakin Date: Thu, 3 May 2018 16:57:44 +0200 Subject: [PATCH 2/4] Added new stage to Jenkinsfile pipeline --- Jenkinsfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2b6476817e..427e698403 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,11 +5,19 @@ pipeline { args '-p 3000:3000' } } + environment { + CI = 'true' + } stages { stage('Build') { steps { sh 'npm install' } } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } } } \ No newline at end of file From 30f3454e1643e40436420fbdd6ec937e6cfd13f7 Mon Sep 17 00:00:00 2001 From: danhakin Date: Thu, 3 May 2018 17:04:29 +0200 Subject: [PATCH 3/4] Add 'Deliver' stage --- Jenkinsfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 427e698403..fa22155154 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,5 +19,12 @@ pipeline { sh './jenkins/scripts/test.sh' } } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } \ No newline at end of file From 79fea226038f48b1e0a8ac3925a23a004a8b36b5 Mon Sep 17 00:00:00 2001 From: danhakin Date: Thu, 10 May 2018 23:59:18 +0200 Subject: [PATCH 4/4] Run docker image as root --- Jenkinsfile | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fa22155154..c6b5e18d00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,30 +1,31 @@ pipeline { - agent { - docker { - image 'node:6-alpine' - args '-p 3000:3000' - } + agent { + docker { + image 'node:6-alpine' + args '-p 3000:3000 -u 0:0' } - environment { - CI = 'true' + + } + stages { + stage('Build') { + steps { + sh 'npm install' + } } - stages { - stage('Build') { - steps { - sh 'npm install' - } - } - stage('Test') { - steps { - sh './jenkins/scripts/test.sh' - } - } - stage('Deliver') { - steps { - sh './jenkins/scripts/deliver.sh' - input message: 'Finished using the web site? (Click "Proceed" to continue)' - sh './jenkins/scripts/kill.sh' - } - } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } + } + environment { + CI = 'true' + } } \ No newline at end of file