diff --git a/defaults/main.yml b/defaults/main.yml index 85f97da..986b8c9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,8 +22,6 @@ droneci_server_exposed_ip: 127.0.0.1 droneci_server_extra_hosts: [] -droneci_server_privileged: False - droneci_agent_container_name: drone-agent droneci_agent_image: "drone/drone-runner-docker:1.0.1" droneci_agent_capacity: 2 @@ -33,8 +31,6 @@ droneci_agent_capacity: 2 # @var droneci_agent_memory_reservation:example: $ "256m" # @var droneci_agent_memory_reservation: $ "_unset_" -droneci_agent_privileged: False - droneci_db_type: sqlite droneci_db_server: localhost droneci_db_port: 5432 diff --git a/templates/services/droneci-compose.yml.j2 b/templates/services/droneci-compose.yml.j2 index 8ae3cc2..95b651d 100644 --- a/templates/services/droneci-compose.yml.j2 +++ b/templates/services/droneci-compose.yml.j2 @@ -21,9 +21,7 @@ services: - {{ '"' + host + '"' }} {% endfor %} {% endif %} - {% if droneci_server_privileged %} privileged: true - {% endif %} environment: - DRONE_SERVER_HOST={{ droneci_host | urlsplit('hostname') }} - DRONE_SERVER_PROTO={{ droneci_host | urlsplit('scheme') }} @@ -69,9 +67,7 @@ services: - droneserver volumes: - {{ droneci_docker_socket_path }}:/var/run/docker.sock - {% if droneci_agent_privileged %} privileged: true - {% endif %} environment: - DRONE_RPC_PROTO=http - DRONE_RPC_HOST=droneserver