From f76805c8b49d7e75f5d22f06cf1a5ae0869ec8d1 Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Fri, 8 Feb 2019 09:44:43 -0500 Subject: [PATCH 1/6] Added support for cap_app and security_opt --- templates/docker-compose.yml.j2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 53e58d0..6a7e5a8 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -50,5 +50,17 @@ services: {% if item.restart is defined %} restart: {{ item.restart }} {% endif %} +{% if item.cap_add is defined %} + cap_add: +{% for item in item.cap_add %} + - {{ item }} +{% endfor %} +{% endif %} +{% if item.security_opt is defined %} + security_opt: +{% for item in item.security_opt %} + - {{ item }} +{% endfor %} +{% endif %} {% endif %} {% endfor %} From c382b2d457437704d629587965d0118b1f00593a Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Fri, 19 Apr 2019 12:39:08 -0400 Subject: [PATCH 2/6] added label support --- templates/docker-compose.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 6a7e5a8..a1dd2e3 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -22,6 +22,12 @@ services: - {{ item }} {% endfor %} {% endif %} +{% if item.labels is defined %}} + labels: +{% for item in item.labels %} + - "{{ item }}" +{% endfor %} +{% endif %} {% if ( item.environment is defined ) or ( item.include_global_env_vars ) %} environment: {% if item.include_global_env_vars %} From 1ba968dabe9480278e4d6c5244ea27023bef671c Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Fri, 3 May 2019 14:58:01 -0400 Subject: [PATCH 3/6] made var name more explicit --- defaults/main.yml | 2 +- tasks/main.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 30cd6f5..061dcfa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -output_path: output/ +docker_compose_generator_output_path: output/ include_global_env_vars: false docker_compose_generator_uid: "" diff --git a/tasks/main.yml b/tasks/main.yml index 33a7c2a..3ebd47d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,12 @@ --- -- name: create destination dir for generated readme +- name: create destination dir for generated docker-compose.yml file: - path: "{{ output_path }}" + path: "{{ docker_compose_generator_output_path }}" state: directory - name: write docker-compose file template: src: ../templates/docker-compose.yml.j2 - dest: "{{ output_path }}/docker-compose.yml" + dest: "{{ docker_compose_generator_output_path }}/docker-compose.yml" owner: "{{ docker_compose_generator_uid }}" group: "{{ docker_compose_generator_gid }}" \ No newline at end of file From b1371ccb78a91e5976bcc568770cedca6e220a3b Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Fri, 3 May 2019 15:00:13 -0400 Subject: [PATCH 4/6] added default rp values --- defaults/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 061dcfa..ddafb1d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,4 +3,7 @@ docker_compose_generator_output_path: output/ include_global_env_vars: false docker_compose_generator_uid: "" -docker_compose_generator_gid: "" \ No newline at end of file +docker_compose_generator_gid: "" + +docker_compose_generator_rp_enabled: false +docker_compose_generator_rp_type: "" \ No newline at end of file From 141fab847cc2d1a652d5cd11bd56d822c394d0e0 Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Fri, 3 May 2019 15:04:03 -0400 Subject: [PATCH 5/6] wrong role --- defaults/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index ddafb1d..061dcfa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -3,7 +3,4 @@ docker_compose_generator_output_path: output/ include_global_env_vars: false docker_compose_generator_uid: "" -docker_compose_generator_gid: "" - -docker_compose_generator_rp_enabled: false -docker_compose_generator_rp_type: "" \ No newline at end of file +docker_compose_generator_gid: "" \ No newline at end of file From 26e910573cfcbe9a658d257ed43ff4045c59b3f6 Mon Sep 17 00:00:00 2001 From: IronicBadger Date: Mon, 20 May 2019 11:24:07 -0400 Subject: [PATCH 6/6] template fixes --- tasks/main.yml | 6 +++--- templates/docker-compose.yml.j2 | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 3ebd47d..33a7c2a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,12 @@ --- -- name: create destination dir for generated docker-compose.yml +- name: create destination dir for generated readme file: - path: "{{ docker_compose_generator_output_path }}" + path: "{{ output_path }}" state: directory - name: write docker-compose file template: src: ../templates/docker-compose.yml.j2 - dest: "{{ docker_compose_generator_output_path }}/docker-compose.yml" + dest: "{{ output_path }}/docker-compose.yml" owner: "{{ docker_compose_generator_uid }}" group: "{{ docker_compose_generator_gid }}" \ No newline at end of file diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index a1dd2e3..7f1d91b 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -22,12 +22,6 @@ services: - {{ item }} {% endfor %} {% endif %} -{% if item.labels is defined %}} - labels: -{% for item in item.labels %} - - "{{ item }}" -{% endfor %} -{% endif %} {% if ( item.environment is defined ) or ( item.include_global_env_vars ) %} environment: {% if item.include_global_env_vars %} @@ -62,6 +56,9 @@ services: - {{ item }} {% endfor %} {% endif %} +{% if item.command is defined %} + command: {{ item.command }} +{% endif %} {% if item.security_opt is defined %} security_opt: {% for item in item.security_opt %}