Prechádzať zdrojové kódy

Merged in FD3-347 (pull request #24)

FD3-347 Se quitó parámetro env(CLIENT)
Guillermo Espinoza 7 rokov pred
rodič
commit
f72e5ff187
2 zmenil súbory, kde vykonal 6 pridanie a 6 odobranie
  1. 5 4
      .drone.yml
  2. 1 2
      app/config/parameters.yml.dist

+ 5 - 4
.drone.yml

@@ -19,7 +19,8 @@ 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
@@ -27,7 +28,7 @@ pipeline:
 
       - yes | mysqladmin -h 127.0.0.1 create fd3_stats
       - yes | mysqladmin -h 127.0.0.1 create fd_session
-      
+
       - echo 'client = Flowdat3-Stats-Drone-Test' | tee /etc/flowdat.conf
       - echo 'date.timezone="America/Argentina/Buenos_Aires"' >> /etc/php/7.0/cli/php.ini
 
@@ -43,7 +44,7 @@ pipeline:
    image: plugins/docker
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - "latest"
    when:
      event: [push]
@@ -54,7 +55,7 @@ pipeline:
    image: plugins/docker
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
-   tag: 
+   tag:
      - "${DRONE_TAG:1:5}"
      - "${DRONE_TAG:1:3}"
    when:

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

@@ -19,7 +19,7 @@ parameters:
     secret: ThisTokenIsNotSoSecretChangeIt
 
     jms_serializer.camel_case_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy
-    
+
     env(HOST_GRAFANA): grafana.%cookie_domain%
     grafana_url: 'http://%env(HOST_GRAFANA)%/dashboard-solo/db/'
 
@@ -47,7 +47,6 @@ parameters:
     rabbit_mq.password: 'guest'
     rabbit_mq.vhost:    '/'
 
-    env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.%cookie_domain_client%.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]