From 8fdbc9d58a1a02cef8ea1a8cb2aeb1ec9d04a793 Mon Sep 17 00:00:00 2001 From: "Nathanael d. Noblet" Date: Wed, 16 Nov 2016 00:25:22 -0700 Subject: [PATCH] Use environment variables for all symfony commands --- tasks/30-cache.yml | 13 ++++++++++--- tasks/40-assets.yml | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tasks/30-cache.yml b/tasks/30-cache.yml index f884f1b57..e6f4f5df6 100644 --- a/tasks/30-cache.yml +++ b/tasks/30-cache.yml @@ -5,8 +5,15 @@ tags: - cache -- name: Warmup sf cache. +- name: Warmup sf cache without environment variables. shell: cd {{symfony_current_release_dir}} && export SYMFONY_ENV={{symfony_project_env}}; {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} {{symfony_project_cache_command}} {{symfony_project_console_opts}} - when: symfony_project_enable_cache_warmup == True + when: symfony_project_enable_cache_warmup == True and symfony_project_uses_env == False + tags: + - cache + +- name: Warmup sf cache with environment variables. + shell: cd {{symfony_current_release_dir}} && export SYMFONY_ENV={{symfony_project_env}} SYMFONY__DATABASE__USER={{symfony_project_db_user}} SYMFONY__DATABASE__PASSWORD={{symfony_project_db_password}}; {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} {{symfony_project_cache_command}} {{symfony_project_console_opts}} + when: symfony_project_enable_cache_warmup == True and symfony_project_uses_env == True tags: - - cache \ No newline at end of file + - cache + diff --git a/tasks/40-assets.yml b/tasks/40-assets.yml index a8b2b8a90..9a1a56ea4 100644 --- a/tasks/40-assets.yml +++ b/tasks/40-assets.yml @@ -1,8 +1,16 @@ --- -- name: Dump assetic assets. +- name: Dump assetic assets without environment variables. shell: cd {{symfony_current_release_dir}} && {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} assetic:dump {{symfony_project_console_opts}} - when: composer_content.stdout.find('assetic-bundle') != -1 + when: composer_content.stdout.find('assetic-bundle') != -1 and symfony_project_uses_env == False -- name: Symlink/install assets. +- name: Dump assetic assets with environment variables. + shell: cd {{symfony_current_release_dir}} && export SYMFONY__DATABASE__USER={{symfony_project_db_user}} SYMFONY__DATABASE__PASSWORD={{symfony_project_db_password}}; {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} assetic:dump {{symfony_project_console_opts}} + when: composer_content.stdout.find('assetic-bundle') != -1 and symfony_project_uses_env == True + +- name: Symlink/install assets without environment variables. shell: cd {{symfony_current_release_dir}} && {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} assets:install --symlink {{symfony_project_console_opts}} - when: symfony_project_symlink_assets == True + when: symfony_project_symlink_assets == True and symfony_project_uses_env == False + +- name: Symlink/install assets with environment variables. + shell: cd {{symfony_current_release_dir}} && export SYMFONY__DATABASE__USER={{symfony_project_db_user}} SYMFONY__DATABASE__PASSWORD={{symfony_project_db_password}}; {{symfony_project_php_path}} {{symfony_project_php_options}} {{symfony_console}} assets:install --symlink {{symfony_project_console_opts}} + when: symfony_project_symlink_assets == True and symfony_project_uses_env == True