From b9c520bd1d4f13057eceb68eca5353844370e259 Mon Sep 17 00:00:00 2001 From: bankdev Date: Fri, 31 Jan 2020 15:13:05 +0700 Subject: [PATCH 1/5] update --- src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.js b/src/index.js index fae3e3500c..9d788da280 100644 --- a/src/index.js +++ b/src/index.js @@ -4,5 +4,6 @@ import './index.css'; import App from './App'; import registerServiceWorker from './registerServiceWorker'; +console.log('hello'); ReactDOM.render(, document.getElementById('root')); registerServiceWorker(); From 15361af2e024ff277ae86cc199928287cdac00d2 Mon Sep 17 00:00:00 2001 From: bankdev Date: Fri, 31 Jan 2020 16:52:01 +0700 Subject: [PATCH 2/5] update --- jenkins/Jenkinsfile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index cf6ea71f5a..0c1098f404 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,29 +2,33 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-p 3000:3000' + args '-u root:root -p 3000:3000' } } environment { CI = 'true' } stages { + // stage('Initialize'){ + // def dockerHome = tool 'myDocker' + // env.PATH = "${dockerHome}/bin:${env.PATH}" + // } 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 message: 'Finished using the web site? (Click "Proceed" to continue)' + // sh './jenkins/scripts/kill.sh' + // } + // } } } From a687864e385ad909a7df45ee8545bb5b939a90a6 Mon Sep 17 00:00:00 2001 From: bankdev Date: Fri, 31 Jan 2020 17:38:49 +0700 Subject: [PATCH 3/5] update --- jenkins/Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 0c1098f404..caf6ecb706 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-u root:root -p 3000:3000' + args '-p 3000:3000' } } environment { @@ -18,11 +18,11 @@ pipeline { sh 'npm install' } } - // stage('Test') { - // steps { - // sh './jenkins/scripts/test.sh' - // } - // } + stage('Test') { + steps { + sh './jenkins/scripts/test.sh' + } + } // stage('Deliver') { // steps { // sh './jenkins/scripts/deliver.sh' From 184d4f045a7e541352dc7c262b5756286487d348 Mon Sep 17 00:00:00 2001 From: bankdev Date: Fri, 31 Jan 2020 17:42:58 +0700 Subject: [PATCH 4/5] update --- jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index caf6ecb706..b84fde3093 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'node:6-alpine' - args '-p 3000:3000' + args '-u root:root -p 3000:3000' } } environment { From 6b407a0ab7382b7b19dba6400aa4fc5f019e69d7 Mon Sep 17 00:00:00 2001 From: bankdev Date: Fri, 31 Jan 2020 18:11:00 +0700 Subject: [PATCH 5/5] Update Code --- jenkins/Jenkinsfile | 14 +++++++------- src/App.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index b84fde3093..652980ed68 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -23,12 +23,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' - // } - // } + stage('Deliver') { + steps { + sh './jenkins/scripts/deliver.sh' + input message: 'Finished using the web site? (Click "Proceed" to continue)' + sh './jenkins/scripts/kill.sh' + } + } } } diff --git a/src/App.js b/src/App.js index 203067e4d7..d9774567c7 100644 --- a/src/App.js +++ b/src/App.js @@ -8,7 +8,7 @@ class App extends Component {
logo -

Welcome to React

+

Welcome to React Wow

To get started, edit src/App.js and save to reload.