소스 검색

Dockerfile con FPM. Composer actualizado. Https en parameters.

Daniel Libonati 7 년 전
부모
커밋
6cd56492c8
3개의 변경된 파일17개의 추가작업 그리고 11개의 파일을 삭제
  1. 10 4
      Dockerfile
  2. 3 3
      app/config/bundles/hwi/oauth-bundle/parameters.yml.dist
  3. 4 4
      composer.lock

+ 10 - 4
Dockerfile

@@ -29,9 +29,15 @@ RUN cp app/config/parameters.yml.docker app/config/parameters.yml ;\
 
 RUN apt-get update && apt-get install -yq gdal-bin
 
+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
+RUN mkdir -p /run/php
+
 CMD  eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
-     rm var/cache/* -rf ;\
-     composer dump-autoload ;\
-     composer run-script post-install-cmd --no-interaction ;\
-     bin/console server:run 0.0.0.0
+    rm var/cache/* -rf ;\
+    composer dump-autoload ;\
+    composer run-script post-install-cmd --no-interaction ;\
+    chmod 777 -R var/cache/ var/logs/ var/sessions/ ;\
+    php-fpm7.0 -F -R -O
      

+ 3 - 3
app/config/bundles/hwi/oauth-bundle/parameters.yml.dist

@@ -1,6 +1,6 @@
 parameters:
     client_id: '%env(OAUTH_CLIENT_ID)%'
     client_secret: '%env(OAUTH_CLIENT_SECRET)%'
-    access_token_url: 'http://%env(HOST_BASE)%/oauth/v2/token'
-    authorization_url: 'http://%env(HOST_BASE)%/oauth/v2/auth'
-    infos_url: 'http://%env(HOST_BASE)%/api/user/me'
+    access_token_url: 'https://%env(HOST_BASE)%/oauth/v2/token'
+    authorization_url: 'https://%env(HOST_BASE)%/oauth/v2/auth'
+    infos_url: 'https://%env(HOST_BASE)%/api/user/me'

+ 4 - 4
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "725e16b6ddb290fa2a513fdfa3c5e876",
+    "content-hash": "63112d0cb0364c5a456765c596cde59d",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1417,7 +1417,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "db2c53f8e2757975d8b910d0a3ab776d62236006"
+                "reference": "30a35248a08d2677c0eb95769be905ce28731c2f"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-05-11T17:56:14+00:00"
+            "time": "2018-05-17T18:14:39+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6568,7 +6568,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },