test

Jenkinsfile

@@ -19,6 +19,15 @@ node{
         sh 'docker system prune -f'
     }
 	
+     def imageApache = stage("Build apache dev")
+	{
+		docker.build("server-apache-dev", "--no-cache --label traefik.enable=true --label traefik.http.routers.server-apache-dev.rule='Host(`angular-dev.foodgame.fr`)' --label traefik.http.routers.server-apache-dev.entrypoints=websecure --label traefik.http.routers.server-apache-dev.tls.certresolver=myresolver -f build/docker/httpd/Dockerfile .")
+	}
+	
+	def imageExpress = stage("Build express dev")
+	{
+		docker.build("server-express-dev", "--no-cache -f express-server/Dockerfile express-server")
+	}
 	
 	// stage("Push preprod images to nexus")
 	// {
@@ -32,19 +41,19 @@ node{
     
 	
 	
-    stage('SonarQube analysis') 
-    {  
-         def scannerHome = tool name: 'SonarQube Scanner', type: 'hudson.plugins.sonar.SonarRunnerInstallation';
-        withSonarQubeEnv('SonarQube') 
-        { 
-        // If you have configured more than one global server connection, you can specify its name
-        sh "${scannerHome}/bin/sonar-scanner  \
-        -Dsonar.projectKey=FatboarProject \
-        -Dsonar.sources=. \
-        -Dsonar.host.url=https://sonarqube.foodgame.fr \
-        -Dsonar.login=sqa_9980d9f6eac6a910947f1b55aaa280c93f02236b"
-        }
-    }
+    // stage('SonarQube analysis') 
+    // {  
+    //      def scannerHome = tool name: 'SonarQube Scanner', type: 'hudson.plugins.sonar.SonarRunnerInstallation';
+    //     withSonarQubeEnv('SonarQube') 
+    //     { 
+    //     // If you have configured more than one global server connection, you can specify its name
+    //     sh "${scannerHome}/bin/sonar-scanner  \
+    //     -Dsonar.projectKey=FatboarProject \
+    //     -Dsonar.sources=. \
+    //     -Dsonar.host.url=https://sonarqube.foodgame.fr \
+    //     -Dsonar.login=sqa_9980d9f6eac6a910947f1b55aaa280c93f02236b"
+    //     }
+    // }
 	
 
     stage('Build Docker MEAN Stack(PreProduction Deployment)') 

build/docker/httpd/Dockerfile

@@ -1,6 +1,6 @@
 FROM httpd:alpine
 
-MAINTAINER You <you@somedomain.com>
+LABEL maintainer="You <you@somedomain.com>" 
 
 COPY $PWD/build/docker/httpd/httpd.conf /usr/local/apache2/conf/httpd.conf
 

build/docker/httpd/httpd.conf

@@ -227,8 +227,8 @@ Group daemon
 <VirtualHost *:80>
     # Le premier serveur virtuel de la liste est aussi le
     # serveur par défaut pour *:80
-    ServerName www.angular-preprod.foodgame.fr
-    ServerAlias angular-preprod.foodgame.fr
+    ServerName www.angular-dev.foodgame.fr
+    ServerAlias angular-dev.foodgame.fr
     DocumentRoot "/usr/local/apache2/htdocs/"
     <Directory /usr/local/apache2/htdocs/>
         Options +Indexes +FollowSymlinks
@@ -252,7 +252,7 @@ ServerAdmin you@example.com
 #
 # If your host doesn't have a registered DNS name, enter its IP address here.
 #
-ServerName angular-preprod.foodgame.fr
+ServerName angular-dev.foodgame.fr
 
 #
 # Deny access to the entirety of your server's filesystem. You must