formation преди 1 година
родител
ревизия
0cbe39447a
променени са 3 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 1 1
      Jenkinsfile
  2. 4 4
      build/docker/apache/apache.conf
  3. 1 1
      docker-compose.yml

+ 1 - 1
Jenkinsfile

@@ -16,7 +16,7 @@ node{
 	 stage('Stop Containers')
     {
         sh 'docker ps | grep "workflow_" -v | awk -F " " \'{ if(NR>1) print $1}\' |xargs docker kill |xargs docker rm || true'
-        sh 'docker system prune -f'
+        // sh 'docker system prune -f'
     }
 	
 	

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

@@ -1,6 +1,6 @@
 <VirtualHost *:80>
-   ServerName angular-preprod.foodgame.fr
-   ServerAlias angular-preprod.foodgame.fr
+   ServerName fatboar.foodgame.fr
+   ServerAlias fatboar.foodgame.fr
    #ProxyPreserveHost On
    #ProxyRequests Off
    #ProxyPass        / http://127.0.0.1:8080/
@@ -20,8 +20,8 @@
 
 <VirtualHost *:443>
    DocumentRoot /var/www/html
-   ServerName angular-preprod.foodgame.fr
-   ServerAlias angular-preprod.foodgame.fr
+   ServerName fatboar.foodgame.fr
+   ServerAlias fatboar.foodgame.fr
    #SSLEnable
    #SSLEngine ON
    #SSLCertificateFile path/to/server.crt

+ 1 - 1
docker-compose.yml

@@ -102,7 +102,7 @@ services:
       - /var/log:/var/log/apache2
     labels:
       - traefik.enable=true
-      - traefik.http.routers.apache_preprod.rule=Host(`angular-preprod.foodgame.fr`)
+      - traefik.http.routers.apache_preprod.rule=Host(`fatboar.foodgame.fr`)
 #     - traefik.http.routers.apache_prod.rule=Host(`${URLANGULAR}`)
       - traefik.http.services.apache_preprod.loadbalancer.server.port=80
       - traefik.http.routers.apache_preprod.entrypoints=websecure