formation 1 gadu atpakaļ
vecāks
revīzija
fb1121dd07
2 mainītis faili ar 16 papildinājumiem un 25 dzēšanām
  1. 13 22
      Jenkinsfile
  2. 3 3
      build/docker/httpd/httpd.conf

+ 13 - 22
Jenkinsfile

@@ -19,15 +19,6 @@ 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")
 	// {
@@ -41,19 +32,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)') 

+ 3 - 3
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-dev.foodgame.fr
-    ServerAlias angular-dev.foodgame.fr
+    ServerName www.angular-preprod.foodgame.fr
+    ServerAlias angular-preprod.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-dev.foodgame.fr
+ServerName angular-preprod.foodgame.fr
 
 #
 # Deny access to the entirety of your server's filesystem. You must