Selaa lähdekoodia

Dockerfile con FPM. Composer actualizado. Https en parameters.

Daniel Libonati 7 vuotta sitten
vanhempi
commit
28594a8ac8
3 muutettua tiedostoa jossa 14 lisäystä ja 7 poistoa
  1. 8 1
      Dockerfile
  2. 3 3
      app/config/bundles/hwi/oauth-bundle/parameters.yml.dist
  3. 3 3
      composer.lock

+ 8 - 1
Dockerfile

@@ -28,8 +28,15 @@ 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 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 --no-progress;\
     rm var/cache/* -rf ;\
     composer run-script post-install-cmd --no-interaction ;\
-    php bin/console server:run 0.0.0.0 --env=dev
+    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'

+ 3 - 3
composer.lock

@@ -1465,7 +1465,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "fda4f8ff6da062fbce7b95a608c7cdbf8b7b34be"
+                "reference": "30a35248a08d2677c0eb95769be905ce28731c2f"
             },
             "type": "library",
             "autoload": {
@@ -1480,7 +1480,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-04-10T17:57:18+00:00"
+            "time": "2018-05-17T18:14:39+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6289,7 +6289,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },