From e2bba0f0b474e4b9450373fe1a539200773cbb3a Mon Sep 17 00:00:00 2001
From: Artur Nowakowski <artnow@st.amu.edu.pl>
Date: Sat, 30 Nov 2019 22:26:56 +0100
Subject: [PATCH] Added frontend building to jenkinsfile

---
 .gitignore  |  5 +----
 Jenkinsfile | 29 +++++++++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index df669c1..67f1e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,4 @@ Homestead.json
 
 .phpunit.result.cache
 .idea
-<<<<<<< HEAD
-
-=======
->>>>>>> dev
+.nuxt
diff --git a/Jenkinsfile b/Jenkinsfile
index 85cfb1d..5785d3c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,18 +3,27 @@ node {
         stage('Checkout') {
             checkout([$class: 'GitSCM', branches: [[name: '*/master']], browser: [$class: 'GogsGit', repoUrl: 'https://git.wmi.amu.edu.pl/s416138/ClearBowl.git'], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'target']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'jenkins_git.wmi.amu.edu.pl', url: 'git@git.wmi.amu.edu.pl:s416138/ClearBowl.git']]])
         }
-        dir('target/api'){
-        docker.image('mysql:latest').withRun('-e "MYSQL_ROOT_PASSWORD=8fcXUlCgC6JCqpoWX64" -e "MYSQL_DATABASE=clearbowl" -e "MYSQL_USER=api" -e "MYSQL_PASSWORD=R23qarINlcALOk2nDg6LbJelaqk"') { c ->
-            docker.image('mysql:latest').inside("--link ${c.id}:db") {
-                stage("Initialize DB"){
-                    sh 'while ! mysqladmin ping -hdb --silent; do sleep 1; done'
+        stage('API'){
+            dir('target/api'){
+            docker.image('mysql:latest').withRun('-e "MYSQL_ROOT_PASSWORD=8fcXUlCgC6JCqpoWX64" -e "MYSQL_DATABASE=clearbowl" -e "MYSQL_USER=api" -e "MYSQL_PASSWORD=R23qarINlcALOk2nDg6LbJelaqk"') { c ->
+                docker.image('mysql:latest').inside("--link ${c.id}:db") {
+                    stage("Initialize DB"){
+                        sh 'while ! mysqladmin ping -hdb --silent; do sleep 1; done'
+                    }
+                }
+                docker.image('circleci/php:7.4').inside("--user 0:0 --link ${c.id}:db") {
+                    stage("Prepare container") { sh 'docker-php-ext-install -j$(nproc) pdo_mysql' }
+                    stage("Build") { sh 'composer install && mv .env.example .env' }
+                    stage("Test") { sh 'vendor/bin/phpunit' }
                 }
             }
-            docker.image('circleci/php:7.4').inside("--user 0:0 --link ${c.id}:db") {
-                stage("Prepare container") { sh 'docker-php-ext-install -j$(nproc) pdo_mysql' }
-                stage("Build") { sh 'composer install && mv .env.example .env' }
-                stage("Test") { sh 'vendor/bin/phpunit' }
             }
-           }
+        }
+        stage('Frontend'){
+            dir('target/front'){
+                docker.image('circleci/node:10'){
+                    stage("Build") { sh 'npm install && npm run build' }
+                }
+            }
         }
 }