Ver código fonte

Dockerfile y composer.lock actualizados

Daniel Libonati 7 anos atrás
pai
commit
5da08f7558
2 arquivos alterados com 2 adições e 22 exclusões
  1. 0 20
      Dockerfile
  2. 2 2
      composer.lock

+ 0 - 20
Dockerfile

@@ -10,12 +10,6 @@ RUN rm -f app/config/parameters.yml
 RUN rm -f app/config/url_webservice.yml
 RUN rm -f app/config/hwioauthbundle/parameters.yml
 
-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 cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml
-
 RUN rm -rf /opt/radius/app/config/parameters.yml /opt/radius/app/config/url_webservice.yml
 
 RUN chmod 0600 /opt/keys/*
@@ -26,13 +20,6 @@ RUN apt-get install -yq php-soap
 
 RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; git clone git@bitbucket.org:ikflowdat/json-wsdl.git /opt/json-wsdl ;  cd /opt/json-wsdl ; composer install --no-scripts --no-interaction --no-progress
 
-RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
- 	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
- 	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
-
 RUN apt-get update && apt-get install -yq php-fpm
 RUN sed -i 's#listen = /run/php/php7.0-fpm.sock#listen = 0.0.0.0:9000#g' /etc/php/7.0/fpm/pool.d/www.conf
 RUN sed -i 's#;clear_env = no#clear_env = no#g' /etc/php/7.0/fpm/pool.d/www.conf
@@ -40,13 +27,6 @@ RUN mkdir -p /run/php
 
 CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress;\
 	rm var/cache/* -rf ;\
- 	cp app/config/parameters.yml.docker app/config/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
- 	cp app/config/url_webservice.yml.docker app/config/url_webservice.yml ;\
- 	cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle/parameters.yml ;\
-	cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml ;\
-	cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml ;\
 	composer run-script post-install-cmd --no-interaction ;\
- 	cat app/config/hwioauthbundle/parameters.yml ;\
 	chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\
  	php-fpm7.0 -F -R -O

+ 2 - 2
composer.lock

@@ -1,7 +1,7 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
     "content-hash": "3050c216fa3cc97aa72883791a068ce1",
@@ -6335,7 +6335,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },