From 20a6d50934e4c1df2b018557474cd2184e7f4f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:33:17 +0100 Subject: [PATCH 01/21] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a1686a..61b1da6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,12 +35,11 @@ pipeline { } stage('Front-end') { agent { - docker { image 'node:10-alpine' } + docker { image 'timbru31/node-alpine-git' } } steps { echo 'Building FrontEnd...' sh ''' - apt-get install git git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy cd FrontEnd From 43a107f608ec467f20e70afcac106c97748f0d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:37:29 +0100 Subject: [PATCH 02/21] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 61b1da6..63cef2e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,6 +42,7 @@ pipeline { sh ''' git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy + git pull cd FrontEnd npm install ng build --prod From 00411499ea908f211c6cf3e265b2423e28c50f0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:38:40 +0100 Subject: [PATCH 03/21] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 63cef2e..e6dfeaa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,6 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull cd FrontEnd From 996579f67e29b0814d5855802be5bad88eb1c909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:40:32 +0100 Subject: [PATCH 04/21] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index e6dfeaa..1b6f2bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,6 +40,7 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' + sudo chown -R 1003:100 "/.npm" cd Punktonerzy git pull cd FrontEnd From 79bf1a5398a6950808ca6bb56163b44efca571b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:45:42 +0100 Subject: [PATCH 05/21] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1b6f2bd..e38ef49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,12 +35,12 @@ pipeline { } stage('Front-end') { agent { - docker { image 'timbru31/node-alpine-git' } + docker { image 'node:latest' } } steps { echo 'Building FrontEnd...' sh ''' - sudo chown -R 1003:100 "/.npm" + [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull cd FrontEnd From b3e040db5208ed40b0b6ec3192157b713376c64a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:51:27 +0100 Subject: [PATCH 06/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e38ef49..133d6ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { } stage('Front-end') { agent { - docker { image 'node:latest' } + docker { image 'node:13' } } steps { echo 'Building FrontEnd...' From 9334b0025074331cbb760646f8dd20873cb60817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:52:46 +0100 Subject: [PATCH 07/21] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 133d6ff..e437bda 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,11 +35,12 @@ pipeline { } stage('Front-end') { agent { - docker { image 'node:13' } + docker { image 'node:10' } } steps { echo 'Building FrontEnd...' sh ''' + sudo chown -R 1003:100 "/.npm" [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 3e10ae90891e7d1e1f7a59a8665fc6b114100444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:53:54 +0100 Subject: [PATCH 08/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e437bda..ed570d4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - sudo chown -R 1003:100 "/.npm" + chown -R 1003:100 "/.npm" [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 2c9293599641b49274081d715ea129f19e93e967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 12:59:28 +0100 Subject: [PATCH 09/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed570d4..9c6ab83 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -40,7 +40,7 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - chown -R 1003:100 "/.npm" + chown -R 1003:100 "~/.npm" [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From e067f4aaf8b089f9235e82453fab1a3bbcf07153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 13:18:54 +0100 Subject: [PATCH 10/21] Update Jenkinsfile --- Dockerfile | 1 + Jenkinsfile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a2d4bea --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +FROM circleci/node:10 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 9c6ab83..2579583 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,12 +35,14 @@ pipeline { } stage('Front-end') { agent { - docker { image 'node:10' } + dockerfile true + } + environment { + HOME = '.' } steps { echo 'Building FrontEnd...' sh ''' - chown -R 1003:100 "~/.npm" [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 6b9b4f9f98b1f47c9ca31ed9cfb41f8d63c7cbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 13:21:00 +0100 Subject: [PATCH 11/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2579583..db5e270 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { git pull cd FrontEnd npm install - ng build --prod + npm run ng build --prod ''' } } From 77698fe7dbb22af907403160211b212b1dff19ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 13:36:43 +0100 Subject: [PATCH 12/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index db5e270..96a180a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { git pull cd FrontEnd npm install - npm run ng build --prod + npx -p @angular/cli ng build --prod ''' } } From 0fd1c5c3483468a5ff6687627fbcef2cb999adae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 13:42:11 +0100 Subject: [PATCH 13/21] Update JenkinsFile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 96a180a..477c3ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,6 +43,7 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' + rm ~/.angular-cli.json [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From cd7d32464048d00f26422a93e32a88c60205578d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 13:54:31 +0100 Subject: [PATCH 14/21] Update Jenkinsfile --- Dockerfile | 2 +- Jenkinsfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2d4bea..3a8e9b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM circleci/node:10 \ No newline at end of file +FROM circleci/node:12 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 477c3ea..96a180a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,6 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - rm ~/.angular-cli.json [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 4b033f3bd06d616119932e90ba17950faea874bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 14:02:40 +0100 Subject: [PATCH 15/21] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96a180a..97fb128 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,7 +48,7 @@ pipeline { git pull cd FrontEnd npm install - npx -p @angular/cli ng build --prod + ./node_modules/@angular/cli/bin/ng build --prod ''' } } From 73e053d851a01f1d5a2683fd46f1fec4d383ce2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 14:07:25 +0100 Subject: [PATCH 16/21] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a8e9b7..a9ef9a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM circleci/node:12 \ No newline at end of file +FROM dmitry7887/alpine-node-git \ No newline at end of file From d72939d56324413fb31c3f7f058559a0200120ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 14:09:40 +0100 Subject: [PATCH 17/21] Update Jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 97fb128..0a2c2b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,6 +43,8 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' + ls -la + rm .angular-cli.json [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 5bd1b545abfd835d12eeaf20d0c19a542469cef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 14:11:09 +0100 Subject: [PATCH 18/21] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0a2c2b0..9634739 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,8 +43,8 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - ls -la - rm .angular-cli.json + ls -la $HOME + rm ~/.angular-cli.json [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull From 9f8ae924b3edd69e48de6b0a0ccfcd82af8a3b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Sun, 24 Nov 2019 14:22:46 +0100 Subject: [PATCH 19/21] Update --- Dockerfile | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9ef9a3..a2d4bea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM dmitry7887/alpine-node-git \ No newline at end of file +FROM circleci/node:10 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 9634739..eef270b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { echo 'Deploying...' } } - stage('Front-end') { + /*stage('Front-end') { agent { dockerfile true } @@ -53,6 +53,6 @@ pipeline { ./node_modules/@angular/cli/bin/ng build --prod ''' } - } + }*/ } } \ No newline at end of file From 9c8aed8dd3b5e10f4fa9a27cfe48cfa0dbfc02d3 Mon Sep 17 00:00:00 2001 From: marcin-szczepanski Date: Mon, 25 Nov 2019 13:31:13 +0100 Subject: [PATCH 20/21] Update Jenkinsfile --- FrontEnd/package.json | 3 ++- Jenkinsfile | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/FrontEnd/package.json b/FrontEnd/package.json index c4f81d8..260fa5f 100644 --- a/FrontEnd/package.json +++ b/FrontEnd/package.json @@ -8,7 +8,8 @@ "build": "ng build", "test": "ng test", "lint": "ng lint", - "e2e": "ng e2e" + "e2e": "ng e2e", + "mybuild": "HOME=/ ./node_modules/@angular/cli/bin/ng build -prod -aot" }, "private": true, "dependencies": { diff --git a/Jenkinsfile b/Jenkinsfile index eef270b..46625e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { echo 'Deploying...' } } - /*stage('Front-end') { + stage('Front-end') { agent { dockerfile true } @@ -50,9 +50,9 @@ pipeline { git pull cd FrontEnd npm install - ./node_modules/@angular/cli/bin/ng build --prod + npm run mybuild ''' } - }*/ + } } } \ No newline at end of file From 539a19b7a9584cd5e336d534a35585f7dc9a4303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= Date: Mon, 25 Nov 2019 13:33:12 +0100 Subject: [PATCH 21/21] Update Jenkinsfile --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46625e2..5a97f26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,8 +43,6 @@ pipeline { steps { echo 'Building FrontEnd...' sh ''' - ls -la $HOME - rm ~/.angular-cli.json [ ! -d "Punktonerzy" ] && git clone https://git.wmi.amu.edu.pl/s416178/Punktonerzy.git cd Punktonerzy git pull