Luciano Andrade 8 年之前
父节点
当前提交
055f8329d3
共有 2 个文件被更改,包括 15 次插入8 次删除
  1. 13 6
      Dockerfile
  2. 2 2
      app/config/hwioauthbundle/parameters.yml.docker

+ 13 - 6
Dockerfile

@@ -12,22 +12,29 @@ RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
 RUN php -r "unlink('composer-setup.php');"
 
 ADD . /opt/ftth
-RUN rm -rf /opt/ftth/vendor/*
 
-RUN cp /opt/ftth/app/config/parameters.yml.docker /opt/ftth/app/config/parameters.yml
-RUN cp /opt/ftth/app/config/url_webservice.yml.dist /opt/ftth/app/config/url_webservice.yml
 
 RUN mkdir ~/.ssh
 RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
 RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
 
 WORKDIR /opt/ftth
-
 RUN chmod 0600 keys/*
-RUN eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction
 
-CMD eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction \
+RUN rm -rf /opt/ftth/vendor/*
+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
+
+CMD eval $(ssh-agent) ; ssh-add keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction ;\
 	rm var/cache/* -rf ;\
+ 	cp app/config/parameters.yml.docker app/config/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 ;\
         composer dump-autoload ;\
         composer run-script symfony-scripts ;\
         bin/console server:run 0.0.0.0

+ 2 - 2
app/config/hwioauthbundle/parameters.yml.docker

@@ -1,6 +1,6 @@
 parameters:
-    client_id:           "1_4201udjx8vsw0go8g84wsksg4o8ogoow0sosc8k44c8cscwssw"
-    client_secret:       "42ymihqa8js408ggk4c0cccswcw8okcogww80co8cogsgc4woo"
+    client_id:           "1_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    client_secret:       "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     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"