Docker base

.drone.yml

@@ -19,22 +19,14 @@ pipeline:
       OAUTH_CLIENT_ID: ""
       OAUTH_CLIENT_SECRET: ""
     commands:
-      - apt-get update && apt-get install -yq build-essential git unzip wget
-      - apt-get install -yq php-cli php-mysql mysql-client php7.0-curl php-xml php-bcmath php-mbstring
+      - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_ftth
       - yes | mysqladmin -h 127.0.0.1 create fd_session
       
-      - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-      - php composer-setup.php --install-dir=/usr/local/bin/ --filename=composer
-      - php -r "unlink('composer-setup.php');"
       - echo 'client = Flowdat3-FTTH-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
-      - mkdir -p /root/.ssh/
-      - ssh-keyscan -p222 200.50.168.30 >> ~/.ssh/known_hosts
-      - ssh-keyscan -p222 infra.flowdat.com >> ~/.ssh/known_hosts
-      - ssh-keyscan -p222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
-      - ssh-keyscan -p22 bitbucket.org >> ~/.ssh/known_hosts
+
       - chmod 0400 keys/bitbucket.id_rsa
       - eval $(ssh-agent); ssh-add keys/bitbucket.id_rsa
       - cp app/config/bundles/ik/device-bundle/parameters.yml.drone app/config/bundles/ik/device-bundle/parameters.yml

Dockerfile

@@ -1,24 +1,10 @@
-FROM debian:9
+FROM docker.infra.flowdat.com/fd3/sf-php:latest
 EXPOSE 8000
 
-RUN apt-get update && apt-get install -yq python git wget vim tmux php-cli php-mysql php-curl graphviz php-amqplib php-xml php-zip
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php composer-setup.php --install-dir=/usr/local/bin --filename=composer
-RUN php -r "unlink('composer-setup.php');"
-
 ADD . /opt/ftth
 
-RUN mkdir ~/.ssh
-RUN ssh-keyscan -H bitbucket.org >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 infra.flowdat.com >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 200.50.168.30 >> ~/.ssh/known_hosts
-RUN ssh-keyscan -H -p 222 gogs.infra.flowdat.com >> ~/.ssh/known_hosts
-
 WORKDIR /opt/ftth
 
-RUN chmod 0600 keys/*
-
 RUN rm -rf /opt/ftth/vendor/*
 RUN rm -f app/config/parameters.yml
 RUN rm -f app/config/url_webservice.yml
@@ -30,10 +16,8 @@ RUN cp app/config/hwioauthbundle/parameters.yml.docker app/config/hwioauthbundle
 
 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
 
-RUN cp -r keys /opt/keys/
 RUN chmod 0600 /opt/keys/*
 
 RUN eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --no-scripts --no-interaction --no-progress
@@ -45,5 +29,5 @@ CMD eval $(ssh-agent) ; ssh-add /opt/keys/bitbucket.id_rsa ; composer install --
  	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 ;\
-        composer run-script post-install-cmd --no-interaction ;\
+    composer run-script post-install-cmd --no-interaction ;\
  	cat app/config/hwioauthbundle/parameters.yml ; bin/console server:run 0.0.0.0 --env=dev