浏览代码

Merged in FD3-347 (pull request #4)

FD3-347 Se quitó parámetro env(CLIENT)
Guillermo Espinoza 7 年之前
父节点
当前提交
fdfd3549de
共有 6 个文件被更改,包括 7 次插入8 次删除
  1. 5 5
      .drone.yml
  2. 2 3
      app/config/parameters.yml.dist
  3. 0 0
      bin/symfony_requirements
  4. 0 0
      var/cache/.gitkeep
  5. 0 0
      var/logs/.gitkeep
  6. 0 0
      var/sessions/.gitkeep

+ 5 - 5
.drone.yml

@@ -20,13 +20,14 @@ pipeline:
       OAUTH_CLIENT_ID: ""
       OAUTH_CLIENT_SECRET: ""
       AMQP_KEY: ""
+      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
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_radius
       - yes | mysqladmin -h 127.0.0.1 create fd_session
-      
+
       - echo 'client = Flowdat3-Radius-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
 
@@ -39,7 +40,7 @@ pipeline:
       - chmod 0777 -R var/logs var/cache var/sessions
       - php bin/console doctrine:schema:update --force -vvv --env=test
       - touch var/logs/test.log
-      - tail -f var/logs/*.log & 
+      - tail -f var/logs/*.log &
 #      - bin/console server:run --help --end=prod
       - vendor/phpunit/phpunit/phpunit -c phpunit.xml.dist
 
@@ -50,7 +51,7 @@ pipeline:
    registry: docker.infra.flowdat.com
    username: drone
    password: 6hd2dLfL
-   tag: 
+   tag:
      - latest
    when:
      event: [pull_request, push, tag]
@@ -63,9 +64,8 @@ pipeline:
    registry: docker.infra.flowdat.com
    username: drone
    password: 6hd2dLfL
-   tag: 
+   tag:
      - ${DRONE_TAG##v}
    when:
      event: [pull_request, push, tag]
      branch: [v*]
-

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

@@ -35,10 +35,9 @@ parameters:
     db_session_user: root
     db_session_password: null
 
-    # RabbitMQ routing key 
+    # RabbitMQ routing key
     env(AMQP_KEY) : ""
 
-    env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]

+ 0 - 0
bin/symfony_requirements


+ 0 - 0
var/cache/.gitkeep


+ 0 - 0
var/logs/.gitkeep


+ 0 - 0
var/sessions/.gitkeep