merge

Dockerfile

@@ -13,12 +13,12 @@ RUN php -r "unlink('composer-setup.php');"
 
 ADD . /opt/ftth
 
-
 RUN mkdir ~/.ssh
 RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
 
 WORKDIR /opt/ftth
+
 RUN chmod 0600 keys/*
 
 RUN rm -rf /opt/ftth/vendor/*
@@ -30,6 +30,8 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml
 RUN cp app/config/url_webservice.yml.docker app/config/url_webservice.yml
 RUN cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml
 
+RUN rm -rf /opt/ftth/app/config/parameters.yml /opt/ftth/app/config/url_webservice.yml
+
 CMD eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
 	rm var/cache/* -rf ;\
  	cp app/config/parameters.yml.docker app/config/parameters.yml ;\
@@ -37,4 +39,4 @@ CMD eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-sc
  	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
         composer dump-autoload ;\
         composer run-script symfony-scripts ;\
-        bin/console server:run 0.0.0.0
+ 	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0

app/config/parameters.yml.docker

@@ -21,7 +21,7 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # Url para logout en repositorio base
-    url_logout: 'http://127.0.0.1/base/app_dev.php/logout'
+    url_logout: 'http://%env(HOST_BASE)%/logout'
 
     # amqp queue config
     rabbit_mq.host:     'amqp'