formation 5 anni fa
parent
commit
67f9b5c863
2 ha cambiato i file con 7 aggiunte e 4 eliminazioni
  1. 5 2
      Jenkinsfile
  2. 2 2
      build/docker/apache/Dockerfile

+ 5 - 2
Jenkinsfile

@@ -36,8 +36,11 @@ node{
         sh 'ls -ls'
     }
     stage('SonarQube analysis') { 
-        def scannerHome = tool 'SonarQube Scanner 2.11'; withSonarQubeEnv('SonarQube') {
+        def scannerHome = tool 'sonar_scanner'; 
+        
+        withSonarQubeEnv('SonarQube') 
+        {
              // If you have configured more than one global server connection, you can specify its name 
              sh "${scannerHome}/bin/sonar-scanner -Dsonar.login=admin -Dsonar.password=admin" } 
-    }
+        }
 }

+ 2 - 2
build/docker/apache/Dockerfile

@@ -12,8 +12,8 @@ RUN docker-php-ext-install opcache \
 COPY $PWD/build/docker/apache/app_php.ini /usr/local/etc/php/conf.d/app_php.ini
 COPY $PWD/build/docker/apache/apache.conf /etc/apache2/sites-available/foodgame.fr.conf
 
-RUN a2dissite 000-default default-ssl
-RUN a2ensite foodgame.fr
+RUN a2dissite 000-default 
+RUN a2ensite foodgame.fr default-ssl
 
 WORKDIR /var/www/index.html