Преглед изворни кода

Dockerfile con FPM. Composer.lock actualizado. Https en parameters.

Daniel Libonati пре 7 година
родитељ
комит
84728ef82a
3 измењених фајлова са 14 додато и 8 уклоњено
  1. 8 2
      Dockerfile
  2. 3 3
      app/config/bundles/hwi/oauth-bundle/parameters.yml.dist
  3. 3 3
      composer.lock

+ 8 - 2
Dockerfile

@@ -1,5 +1,5 @@
 FROM docker.infra.flowdat.com/fd3/sf-php:latest
-EXPOSE 8000
+EXPOSE 9000
 
 ADD . /opt/cablemodem
 
@@ -32,8 +32,14 @@ COPY docsis.sh /opt
 RUN chmod +x /opt/docsis.sh
 RUN bash -c /opt/docsis.sh
 
+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@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "db2c53f8e2757975d8b910d0a3ab776d62236006"
+                "reference": "30a35248a08d2677c0eb95769be905ce28731c2f"
             },
             "type": "library",
             "autoload": {
@@ -1480,7 +1480,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-05-11T17:56:14+00:00"
+            "time": "2018-05-17T18:14:39+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6334,7 +6334,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },