deuxieme commit

Jenkinsfile

@@ -14,7 +14,7 @@ node{
         containerMysql=imageSql.run('--name server-mysql-dev')
         containerApache=imageApache.run('-p 8080:80 --link server-mysql-dev:mysql')
     }
-    stage('Waiting Container'){
+    /* stage('Waiting Container'){
         waitUntil{
             try{
                 sh "docker exec ${containerApache.id} php -v"
@@ -23,7 +23,7 @@ node{
             return false
         }
                   }
-    }
+    } */
     stage('stage 1bis'){
         sh 'docker -v'
         sh 'docker ps' 

build/docker/apache/Dockerfile

@@ -10,11 +10,11 @@ RUN docker-php-ext-install opcache \
     && docker-php-ext-install pdo_mysql 
 
 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/docker.conf
+COPY $PWD/build/docker/apache/apache.conf /etc/apache2/sites-available/foodgame.conf
 RUN a2dissite 000-default default-ssl
-RUN a2ensite docker
+RUN a2ensite foodgame
 
 COPY $PWD /var/www
 WORKDIR /var/www
 
-EXPOSE 8090
+EXPOSE 80

build/docker/apache/apache.conf

@@ -1,4 +1,4 @@
-<VirtualHost *:8090>
+<VirtualHost *:80>
    DocumentRoot /var/www/src
    <Directory /var/www/src>
         option +Indexes +FollowSymlinks