Jelajahi Sumber

fix build, except test

Luciano Andrade 7 tahun lalu
induk
melakukan
1d66109738
2 mengubah file dengan 6 tambahan dan 10 penghapusan
  1. 4 8
      .drone.yml
  2. 2 2
      app/config/parameters.yml.dist

+ 4 - 8
.drone.yml

@@ -1,11 +1,9 @@
 services:
-  database:
+  mysql:
     image: mysql:5.5
     environment:
       - MYSQL_ROOT_PASSWORD=
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-      - MYSQL_USER=drone
-      - MYSQL_PASSWORD=drone
   amqp:
     image: rabbitmq:3-management
 pipeline:
@@ -27,18 +25,16 @@ pipeline:
       CLIENT: fd3
     commands:
       - command -v mysqladmin >/dev/null 2>&1 || { echo "I require mysqladmin but it's not installed.  Aborting." >&2; exit 1; }
-      - while ! mysqladmin ping -h 127.0.0.1 --silent; do :; done
+      - while ! mysqladmin ping -h mysql --silent; do :; done
 
-      - yes | mysqladmin -h 127.0.0.1 create fd3_dhcp
-      - yes | mysqladmin -h 127.0.0.1 create fd_session
+      - yes | mysqladmin -h mysql create fd3_dhcp
+      - yes | mysqladmin -h mysql create fd_session
 
       - echo 'client = Flowdat3-DHCP-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
 
       - 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
-      - cp app/config/bundles/ik/base-admin-bundle/parameters.yml.dist app/config/bundles/ik/base-admin-bundle/parameters.yml
       - composer install -n --no-progress
       - composer dump-autoload --optimize
       - chmod 0777 -R var/logs var/cache var/sessions

+ 2 - 2
app/config/parameters.yml.dist

@@ -2,7 +2,7 @@
 # Set parameters here that may be different on each deployment target of the app, e.g. development, staging, production.
 # http://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 parameters:
-    database_host: 127.0.0.1
+    database_host: mysql
     database_port: ~
     database_name: fd3_dhcp
     database_user: root
@@ -21,7 +21,7 @@ parameters:
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
 
     # amqp queue config
-    rabbit_mq.host:     127.0.0.1
+    rabbit_mq.host:     amqp
     rabbit_mq.port:     5672
     rabbit_mq.user:     'guest'
     rabbit_mq.password: 'guest'