small fixes for pip and default variables
This commit is contained in:
parent
1c4e8038f1
commit
597a0d5825
@ -8,11 +8,8 @@
|
|||||||
|
|
||||||
- name: Install required dependencies
|
- name: Install required dependencies
|
||||||
pip:
|
pip:
|
||||||
name: "{{ item }}"
|
name: "{{ __drone_pip_dependencies }}"
|
||||||
state: present
|
state: present
|
||||||
with_items:
|
|
||||||
- docker
|
|
||||||
- docker-compose
|
|
||||||
become: True
|
become: True
|
||||||
become_user: root
|
become_user: root
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
- name: Concat lists for proxy setup
|
- name: Concat lists for proxy setup
|
||||||
set_fact:
|
set_fact:
|
||||||
droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy }}"
|
droneci_no_proxy: "{{ __droneci_default_no_proxy }} + {{ droneci_no_proxy | default([]) }}"
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: Deploy compose file to '{{ droneci_service_directory }}'
|
- name: Deploy compose file to '{{ droneci_service_directory }}'
|
||||||
|
@ -2,3 +2,7 @@
|
|||||||
__droneci_default_no_proxy:
|
__droneci_default_no_proxy:
|
||||||
- droneserver
|
- droneserver
|
||||||
- droneagent
|
- droneagent
|
||||||
|
|
||||||
|
__drone_pip_dependencies:
|
||||||
|
- docker
|
||||||
|
- docker-compose
|
||||||
|
Loading…
Reference in New Issue
Block a user