Compare commits
2 Commits
2b43003564
...
9d7d11c384
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9d7d11c384 | ||
|
|
70bc3ce15b |
@@ -3,7 +3,7 @@
|
|||||||
namespace: uumas
|
namespace: uumas
|
||||||
name: docker
|
name: docker
|
||||||
description: Roles for installing services in docker containers
|
description: Roles for installing services in docker containers
|
||||||
version: 0.7.0
|
version: 0.7.2
|
||||||
readme: README.md
|
readme: README.md
|
||||||
repository: https://git.uumas.fi/uumas/ansible-docker
|
repository: https://git.uumas.fi/uumas/ansible-docker
|
||||||
license_file: LICENSE
|
license_file: LICENSE
|
||||||
|
|||||||
@@ -43,9 +43,10 @@
|
|||||||
name: "{{ ('local_' + docker_service) if dockerfile is defined and dockerfile | length > 0 else docker_image }}"
|
name: "{{ ('local_' + docker_service) if dockerfile is defined and dockerfile | length > 0 else docker_image }}"
|
||||||
register: existing_image
|
register: existing_image
|
||||||
|
|
||||||
- name: Set check nmode container_image variable
|
- name: Set check mode container_image variable
|
||||||
set_fact:
|
set_fact:
|
||||||
container_image: "{{ existing_image.images[0] }}"
|
container_image: "{{ existing_image.images[0] }}"
|
||||||
|
when: existing_image.images | length > 0
|
||||||
|
|
||||||
- name: Set image user variable
|
- name: Set image user variable
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
container_published_ports: []
|
container_published_ports: []
|
||||||
docker_volumes_new: []
|
docker_volumes_new: []
|
||||||
final_docker_volumes: "{{ docker_volumes }}"
|
final_docker_volumes: "{{ docker_volumes }}"
|
||||||
|
container_image: ''
|
||||||
|
|
||||||
- name: Set docker service full name
|
- name: Set docker service full name
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -61,7 +61,7 @@
|
|||||||
- name: "Container for {{ docker_service_name }}"
|
- name: "Container for {{ docker_service_name }}"
|
||||||
docker_container:
|
docker_container:
|
||||||
name: "{{ docker_service_name }}"
|
name: "{{ docker_service_name }}"
|
||||||
image: "{{ container_image.Id }}"
|
image: "{{ container_image.Id if container_image != '' else docker_image }}"
|
||||||
user: "{{ docker_user if docker_host_user else omit }}"
|
user: "{{ docker_user if docker_host_user else omit }}"
|
||||||
mounts: "{{ docker_volume_definition }}"
|
mounts: "{{ docker_volume_definition }}"
|
||||||
published_ports: "{{ container_published_ports + docker_published_ports }}"
|
published_ports: "{{ container_published_ports + docker_published_ports }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user