Skip to content

Commit e8da1a3

Browse files
update docker config with orgs
1 parent ed5cf1d commit e8da1a3

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

ansible/roles/docker/tasks/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
- name: change core dump path
33
sudo: yes
4+
when: docker_config == "runnable"
45
tags: coreDump
56
sysctl:
67
name=kernel.core_pattern
@@ -37,6 +38,12 @@
3738
update_cache: yes
3839
state: present
3940

41+
- name: get org id
42+
sudo: yes
43+
when: docker_config == "docks"
44+
shell: "cut -d, -f 1 /opt/runnable/host_tags"
45+
register: org_id
46+
4047
- name: copy docker config file
4148
sudo: yes
4249
template:

ansible/roles/docker/templates/docks

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ DOCKER_OPTS="$DOCKER_OPTS --tlsverify --tlscacert={{ docker_ca_path }}"
33
DOCKER_OPTS="$DOCKER_OPTS --tlscert={{ docker_cert_path }} --tlskey={{ docker_key_path }}"
44
DOCKER_OPTS="$DOCKER_OPTS -g /docker --insecure-registry registry.runnable.com --icc=false"
55
DOCKER_OPTS="$DOCKER_OPTS --bip 172.17.42.1/16"
6-
DOCKER_OPTS="$DOCKER_OPTS --dns=172.17.42.1 --dns=8.8.8.8"
6+
DOCKER_OPTS="$DOCKER_OPTS --dns=172.17.42.1 --dns=8.8.8.8"
7+
DOCKER_OPTS="$DOCKER_OPTS --label org={{ org_id.stdout }}"

0 commit comments

Comments
 (0)