瀏覽代碼

Dockerfile con FPM. Composer actualizado. Https en parameters.

Daniel Libonati 7 年之前
父節點
當前提交
629918aa4f
共有 3 個文件被更改,包括 15 次插入9 次删除
  1. 7 1
      Dockerfile
  2. 5 5
      app/config/hwioauthbundle/parameters.yml.dist
  3. 3 3
      composer.lock

+ 7 - 1
Dockerfile

@@ -33,6 +33,11 @@ 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/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
+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 ;\
@@ -43,4 +48,5 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
 	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 ;\
- 	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

+ 5 - 5
app/config/hwioauthbundle/parameters.yml.dist

@@ -1,6 +1,6 @@
 parameters:
-    client_id:           "1_4201udjx8vsw0go8g84wsksg4o8ogoow0sosc8k44c8cscwssw"
-    client_secret:       "42ymihqa8js408ggk4c0cccswcw8okcogww80co8cogsgc4woo"
-    access_token_url:    "http://127.0.0.1/base/app_dev.php/oauth/v2/token"
-    authorization_url:   "http://127.0.0.1/base/app_dev.php/oauth/v2/auth"
-    infos_url:           "http://127.0.0.1/base/app_dev.php/api/user/me"
+    client_id: '%env(OAUTH_CLIENT_ID)%'
+    client_secret: '%env(OAUTH_CLIENT_SECRET)%'
+    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",
@@ -6335,7 +6335,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },