formation 5 лет назад
Родитель
Сommit
9ab0ac61dc
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      Jenkinsfile
  2. 1 1
      build/docker/apache/Dockerfile
  3. 1 1
      build/docker/apache/apache.conf

+ 1 - 1
Jenkinsfile

@@ -15,7 +15,7 @@ node{
         imageApache=docker.build('server-apache-dev', '--no-cache -f build/docker/apache/Dockerfile .')
         imageApache=docker.build('server-apache-dev', '--no-cache -f build/docker/apache/Dockerfile .')
         imageSql=docker.build('server-mysql-dev', '--no-cache -f build/docker/mysql/Dockerfile .')
         imageSql=docker.build('server-mysql-dev', '--no-cache -f build/docker/mysql/Dockerfile .')
         containerMysql=imageSql.run('--name server-mysql-dev')
         containerMysql=imageSql.run('--name server-mysql-dev')
-        containerApache=imageApache.run('-p 8090:8090 --link server-mysql-dev:mysql')
+        containerApache=imageApache.run('-p 8080:80 --link server-mysql-dev:mysql')
     }
     }
      stage('Waiting Container'){
      stage('Waiting Container'){
         waitUntil{
         waitUntil{

+ 1 - 1
build/docker/apache/Dockerfile

@@ -18,4 +18,4 @@ RUN a2ensite foodgame.fr
 COPY $PWD /var/www/
 COPY $PWD /var/www/
 WORKDIR /var/www
 WORKDIR /var/www
 
 
-EXPOSE 8090
+EXPOSE 80

+ 1 - 1
build/docker/apache/apache.conf

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