|
@@ -10,11 +10,11 @@ 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
|
|
|
-
|
|
|
-RUN cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml
|
|
|
+# estos archivos deben ser generados con su correspondiente .dist desde el composer.
|
|
|
+#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
|
|
|
+#RUN cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/parameters.yml
|
|
|
|
|
|
RUN rm -rf /opt/ftth/app/config/parameters.yml /opt/ftth/app/config/url_webservice.yml
|
|
|
|
|
@@ -28,11 +28,11 @@ RUN pip install -e /opt/netmiko
|
|
|
|
|
|
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 cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/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 ;\
|
|
|
- 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 cp app/config/bundles/ik/device-bundle/parameters.yml.docker app/config/bundles/ik/device-bundle/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 ;\
|
|
|
+# 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
|
|
@@ -41,7 +41,11 @@ RUN sed -i 's#user = www-data#user = root#g' /etc/php/7.0/fpm/pool.d/www.conf
|
|
|
RUN sed -i 's#group = www-data#group = root#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;\
|
|
|
+CMD env ; cp /opt/ftth/keys/fullchain.pem /usr/share/ca-certificates/$HOST_BASE ;\
|
|
|
+ cat /usr/local/share/ca-certificates/$HOST_BASE ;\
|
|
|
+ echo $HOST_BASE >> /etc/ca-certificates.conf ;\
|
|
|
+ update-ca-certificates ;\
|
|
|
+ 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 ;\
|
|
|
cat app/config/hwioauthbundle/parameters.yml ;\
|