jenkins

Jenkinsfile

@@ -46,24 +46,24 @@ node{
     stage('stage 2bis'){
         sh 'ls -ls'
     }
-   stage('Test') {
+//    stage('Test') {
     
-       dir("${env.WORKSPACE}/angular-client") {
-     sh 'npm i @angular-devkit/build-angular@0.901.15 typescript@3.8.3 @angular/compiler-cli@9.1.4'
+//        dir("${env.WORKSPACE}/angular-client") {
+//      sh 'npm i @angular-devkit/build-angular@0.901.15 typescript@3.8.3 @angular/compiler-cli@9.1.4'
     		
-    try {
+//     try {
         
-        // Exporter la variable d'environnement NODE_OPTIONS
-        sh 'npm run test-ci'
+//         // Exporter la variable d'environnement NODE_OPTIONS
+//         sh 'npm run test-ci'
         
-    } catch(err) {
-        sh 'echo TEST FAILED'
-        junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
-        throw err
-    }
-}
+//     } catch(err) {
+//         sh 'echo TEST FAILED'
+//         junit 'target/surefire-reports/TESTS-TestSuite.xml/*.xml'
+//         throw err
+//     }
+// }
 
-   }
+//    }
 
 
     // def imageApache = stage("Build apache preprod")
@@ -105,27 +105,27 @@ node{
 	// 		imageExpress.push('latest')
 	// 	}*/
 	// }
-    // 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=sqp_09ee9072c917af8212864baf0f75c950afc14c64"
-    //     }
-    // }
+    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=sqp_09ee9072c917af8212864baf0f75c950afc14c64"
+        }
+    }
 	
 
-    // stage('Build Docker MEAN Stack(Test Deployment)') 
-    // {
-    //     sh 'docker-compose -v'
-    //     sh 'docker-compose build'
-    //     sh 'docker-compose up -d'
-    // }
+    stage('Build Docker MEAN Stack(Test Deployment)') 
+    {
+        sh 'docker-compose -v'
+        sh 'docker-compose build'
+        sh 'docker-compose up -d'
+    }
    
     stage('Fin du Pipeline') 
     {

docker-compose.yml

@@ -1,113 +1,113 @@
-version: '3.0' # specify docker-compose version
+# version: '3.0' # specify docker-compose version
  
 # Define the services/ containers to be run
-services:
- angular: # name of the first service
-  build: angular-client # specify the directory of the Dockerfile
-  ports:
-  - "4200:4200" # specify port mapping
+# services:
+#  angular: # name of the first service
+#   build: angular-client # specify the directory of the Dockerfile
+#   ports:
+#   - "4200:4200" # specify port mapping
  
- express: # name of the second service
-  build: express-server # specify the directory of the Dockerfile
-  ports:
-  - "9991:9991" #specify ports mapping
-  links:
-  - database # link this service to the database service
+#  express: # name of the second service
+#   build: express-server # specify the directory of the Dockerfile
+#   ports:
+#   - "9991:9991" #specify ports mapping
+#   links:
+#   - database # link this service to the database service
  
- database: # name of the third service
-  image: mongo # specify image to build container from
-  ports:
-  - "27017:27017" # specify port forwarding
+#  database: # name of the third service
+#   image: mongo # specify image to build container from
+#   ports:
+#   - "27017:27017" # specify port forwarding
 
 
 
 
-# version: '3'
+version: '3'
 
-# networks:
-#   private:
-#   web:
-#    external:
-#     name: web
-#   #pipeline-test-mean-stack-docker_default:
-#   #pipeline-test-mean-stack-docker_private:
-#   #grafana:
+networks:
+  private:
+  web:
+   external:
+    name: web
+  #pipeline-test-mean-stack-docker_default:
+  #pipeline-test-mean-stack-docker_private:
+  #grafana:
 
-# #volumes:
-# #  app_data: {}
-# #  database:
+#volumes:
+#  app_data: {}
+#  database:
 
-# services:
-#   express_preprod:
-#     #   container_name: express_"${ENV}"
-#         build: express-server
-#         ports:
-#           - "4000:4000"
-#         networks:
-#           - web
-#           - private
-#           #- pipeline-test-mean-stack-docker_default
-#           #- pipeline-test-mean-stack-docker_private
-#           #- grafana
-#         volumes:
-#           - /var/log:/var/www/app/log/root
-#         labels:
-#           - traefik.enable=true
-#           - traefik.http.routers.express_preprod.rule=Host(`api-preprod.foodgame.fr`)
-#     #     - traefik.http.routers.apache_prod.rule=Host(`${URLEXPRESS}`)
-#           - traefik.http.services.express_preprod.loadbalancer.server.port=4000
-#           - traefik.http.routers.express_preprod.entrypoints=websecure
-#           - traefik.http.routers.express_preprod.tls.certresolver=myresolver
-#         links:
-#           - database_preprod
-#         restart: always
+services:
+  express_preprod:
+    #   container_name: express_"${ENV}"
+        build: express-server
+        ports:
+          - "4000:4000"
+        networks:
+          - web
+          - private
+          #- pipeline-test-mean-stack-docker_default
+          #- pipeline-test-mean-stack-docker_private
+          #- grafana
+        volumes:
+          - /var/log:/var/www/app/log/root
+        labels:
+          - traefik.enable=true
+          - traefik.http.routers.express_preprod.rule=Host(`api-preprod.foodgame.fr`)
+    #     - traefik.http.routers.apache_prod.rule=Host(`${URLEXPRESS}`)
+          - traefik.http.services.express_preprod.loadbalancer.server.port=4000
+          - traefik.http.routers.express_preprod.entrypoints=websecure
+          - traefik.http.routers.express_preprod.tls.certresolver=myresolver
+        links:
+          - database_preprod
+        restart: always
 
-#   database_preprod:
-# #   container_name: mongo_"${ENV}"
-#     image: mongo:4.4.6
-#     ports:
-#       - "27017:27017"
-#     volumes:
-#       - ./backup:/backup
-#       - /var/lib/mongodb/data_preprod:/data/db
-# #     - database:/data/database
-#     labels:
-#       - traefik.enable=true
-#       - traefik.http.routers.database_preprod.rule=Host(`mongodb-preprod.foodgame.fr`)
-# #     - traefik.http.routers.apache_prod.rule=Host(`${URLMONGO}`)
-#       - traefik.http.services.database_preprod.loadbalancer.server.port=27017
-#       - traefik.http.routers.database_preprod.entrypoints=websecure
-#       - traefik.http.routers.database_preprod.tls.certresolver=myresolver  
-#     networks:
-#       - web
-#       - private
-#       #- pipeline-test-FatboarProject_default
-#       #- pipeline-test-FatboarProject_private
-#     restart: always
+  database_preprod:
+#   container_name: mongo_"${ENV}"
+    image: mongo:4.4.6
+    ports:
+      - "27017:27017"
+    volumes:
+      - ./backup:/backup
+      - /var/lib/mongodb/data_preprod:/data/db
+#     - database:/data/database
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.database_preprod.rule=Host(`mongodb-preprod.foodgame.fr`)
+#     - traefik.http.routers.apache_prod.rule=Host(`${URLMONGO}`)
+      - traefik.http.services.database_preprod.loadbalancer.server.port=27017
+      - traefik.http.routers.database_preprod.entrypoints=websecure
+      - traefik.http.routers.database_preprod.tls.certresolver=myresolver  
+    networks:
+      - web
+      - private
+      #- pipeline-test-FatboarProject_default
+      #- pipeline-test-FatboarProject_private
+    restart: always
 
-#   apache_preprod:
-# #   container_name: apache_"${ENV}"    
-#     build:  
-#       context: ./
-#      #dockerfile: build/docker/httpd/Dockerfile
-#       dockerfile: build/docker/apache/Dockerfile
-#     ports:
-#       - "8080:80"
-#     networks:
-#       - web
-#       - private
-#       #- pipeline-test-FatboarProject_default
-#       #- pipeline-test-FatboarProject_private
-#     volumes:     
-#       - /var/log:/var/log/apache2
-#     labels:
-#       - traefik.enable=true
-#       - traefik.http.routers.apache_prod.rule=Host(`angular-preprod.foodgame.fr`)
-# #     - traefik.http.routers.apache_prod.rule=Host(`${URLANGULAR}`)
-#       - traefik.http.services.apache_prod.loadbalancer.server.port=80
-#       - traefik.http.routers.apache_prod.entrypoints=websecure
-#       - traefik.http.routers.apache_prod.tls.certresolver=myresolver  
-#     restart: always  
+  apache_preprod:
+#   container_name: apache_"${ENV}"    
+    build:  
+      context: ./
+     #dockerfile: build/docker/httpd/Dockerfile
+      dockerfile: build/docker/apache/Dockerfile
+    ports:
+      - "8080:80"
+    networks:
+      - web
+      - private
+      #- pipeline-test-FatboarProject_default
+      #- pipeline-test-FatboarProject_private
+    volumes:     
+      - /var/log:/var/log/apache2
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.apache_prod.rule=Host(`angular-preprod.foodgame.fr`)
+#     - traefik.http.routers.apache_prod.rule=Host(`${URLANGULAR}`)
+      - traefik.http.services.apache_prod.loadbalancer.server.port=80
+      - traefik.http.routers.apache_prod.entrypoints=websecure
+      - traefik.http.routers.apache_prod.tls.certresolver=myresolver  
+    restart: always