ansible/xoxys.droneci
1
0
Fork 0
Code Issues Pull Requests Releases Activity

run container in privileged mode if needed
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Robert Kaussow 2019-05-10 12:09:06 +02:00
parent 71b94695db
commit 25ba73e6dd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -15,11 +15,13 @@ droneci_server_exposed_ip: 127.0.0.1
# droneci_server_memory_limit: 512m # defaults to not set # droneci_server_memory_limit: 512m # defaults to not set
# droneci_server_memory_reservation: 256m # defaults to not set # droneci_server_memory_reservation: 256m # defaults to not set
# droneci_server_extra_hosts: [] # droneci_server_extra_hosts: []
droneci_server_privileged: False
droneci_agent_image: "drone/agent:{{ droneci_version }}" droneci_agent_image: "drone/agent:{{ droneci_version }}"
dronevi_agent_capacity: 2 dronevi_agent_capacity: 2
# droneci_agent_memory_limit: 512m # defaults to not set # droneci_agent_memory_limit: 512m # defaults to not set
# droneci_agent_memory_reservation: 256m # defaults to not set # droneci_agent_memory_reservation: 256m # defaults to not set
droneci_agent_privileged: False
droneci_postgres_enabled: False droneci_postgres_enabled: False
droneci_postgres_ssl_mode: disable droneci_postgres_ssl_mode: disable

6
templates/services/droneci-compose.yml.j2
View File

@ -20,6 +20,9 @@ services:
- {{ '"' + host + '"' }} - {{ '"' + host + '"' }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if droneci_server_privileged %}
privileged: true
{% endif %}
environment: environment:
- DRONE_SERVER_HOST={{ droneci_host | urlsplit('hostname') }} - DRONE_SERVER_HOST={{ droneci_host | urlsplit('hostname') }}
- DRONE_SERVER_PROTO={{ droneci_host | urlsplit('scheme') }} - DRONE_SERVER_PROTO={{ droneci_host | urlsplit('scheme') }}
@ -60,6 +63,9 @@ services:
- droneserver - droneserver
volumes: volumes:
- {{ droneci_docker_socket_path }}:/var/run/docker.sock - {{ droneci_docker_socket_path }}:/var/run/docker.sock
{% if droneci_agent_privileged %}
privileged: true
{% endif %}
environment: environment:
- DRONE_RPC_SERVER=http://droneserver - DRONE_RPC_SERVER=http://droneserver
- DRONE_RPC_SECRET={{ droneci_secret }} - DRONE_RPC_SECRET={{ droneci_secret }}