Skip to content

Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
x3rus wants to merge 6 commits into
base:master
Choose a base branch
from
Open

Add TXT record with container ID length 60 to keep logical process in the script #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a091ed
First setup for systemd startup script
x3rus Jan 9, 2017
5d0d961
Add documentation but, but not finish
x3rus Jan 9, 2017
cf6175f
Add documentation to enable dockerDDNS in systemd for ArchLinux and U…
x3rus Jan 9, 2017
411c725
Fix typo in configuration example , Remove dot at the end of the doma…
x3rus Jan 10, 2017
41b5bb3
Fix Regex to work with docker 1.12.1 , event message change , I think…
x3rus Jan 12, 2017
c5a4af0
Fix Add container id in the TXT DNS entry , to be able to delete reco…
x3rus Jan 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions dockerDDNS.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
container_id_60 = container_id[:60]
detail = c.inspect_container(container_id)
container_hostname = detail["Config"]["Hostname"]
container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
if container_name != container_hostname:
nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
if re.search("_", container_name):
alternate_name = re.sub('_','-',container_name)
logging.info("Adding alternate name %s to %s", alternate_name, container_name)
nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
nsupdate.stdin.write(bytes("send\n", "UTF-8"))
nsupdate.stdin.close()


def remove_container(container_id):
logging.info("Destroying %s", container_id)
short_id = container_id[:12]
short_id = container_id[:60]
record_to_delete = [short_id]
logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
if line != '':
text_line = line.decode().rstrip()
logging.debug("Read line %s", text_line)
m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
if m:
event = m.group(2)
container_id = m.group(1)
event = m.group(1)
container_id = m.group(2)
logging.debug("Got event %s for container %s", event, container_id)

if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)
37 changes: 37 additions & 0 deletions systemd/Ubuntu/README.mkd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

$ systemctl list-unit-files | grep dockerDDN
dockerDDNS.service disabled
2. Try to start the new service

$ systemctl start dockerDDNS.service
3. View the status and fix it problems

$ systemctl status dockerDDNS.service
dockerDDNS.service - Update a dynamic DNS when Docker starts containers
Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
Main PID: 2067 (python3)
Tasks: 7 (limit: 4915)
Memory: 33.4M
CPU: 263ms
CGroup: /system.slice/dockerDDNS.service
├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
└─2083 docker events
4. Double check, just to be sure :D

$ ps aux | grep dockerDDNS
12 changes: 12 additions & 0 deletions systemd/Ubuntu/dockerDDNS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1

13 changes: 13 additions & 0 deletions systemd/Ubuntu/dockerDDNS.service
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target
37 changes: 37 additions & 0 deletions systemd/archLinux/README.mkd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

$ systemctl list-unit-files | grep dockerDDN
dockerDDNS.service disabled
2. Try to start the new service

$ systemctl start dockerDDNS.service
3. View the status and fix it problems

$ systemctl status dockerDDNS.service
dockerDDNS.service - Update a dynamic DNS when Docker starts containers
Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
Main PID: 2067 (python3)
Tasks: 7 (limit: 4915)
Memory: 33.4M
CPU: 263ms
CGroup: /system.slice/dockerDDNS.service
├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
└─2083 docker events
4. Double check, just to be sure :D

$ ps aux | grep dockerDDNS
12 changes: 12 additions & 0 deletions systemd/archLinux/dockerDDNS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1

13 changes: 13 additions & 0 deletions systemd/archLinux/dockerDDNS.service
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add TXT record with container ID length 60 to keep logical process in the script by x3rus · Pull Request #14 · ggtools/docker-tools · GitHub
Skip to content
Add TXT record with container ID length 60 to keep logical process in the script#14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

x3rus
wants to merge
6
commits into

base:master
Choose a base branch

from

 Open


Add TXT record with container ID length 60 to keep logical process in the script
#14
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5a091ed

First setup for systemd startup script


x3rus Jan 9, 2017
5d0d961

Add documentation but, but not finish


x3rus Jan 9, 2017
cf6175f

Add documentation to enable dockerDDNS in systemd for ArchLinux and U…


x3rus Jan 9, 2017
411c725

Fix typo in configuration example , Remove dot at the end of the doma…


x3rus Jan 10, 2017
41b5bb3

Fix Regex to work with docker 1.12.1 , event message change , I think…


x3rus Jan 12, 2017
c5a4af0

Fix Add container id in the TXT DNS entry , to be able to delete reco…


x3rus Jan 12, 2017

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 11 additions & 7 deletions
dockerDDNS.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,14 +23,15 @@

zone_update_add_alias_template = """update delete {0}.{1}
update add {0}.{1} 600 CNAME {2}.{1}.
update add {2}.{1} 600 TXT dockerDDNS-alias:{0}:
update add {3}.{1} 600 TXT dockerDDNS-alias:{0}:
"""

zone_update_delete_record_template = """update delete {0}.{1}
"""


def register_container(container_id):
 container_id_60 = container_id[:60]
 detail = c.inspect_container(container_id)
 container_hostname = detail["Config"]["Hostname"]
 container_name = detail["Name"].split('/', 1)[1]
Expand All@@ -45,18 +46,18 @@ def register_container(container_id):
 nsupdate.stdin.write(bytes(zone_update_start_template.format(args.server, args.zone), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_template.format(container_hostname, args.domain, container_ip), "UTF-8"))
 if container_name != container_hostname:
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(container_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 if re.search("_", container_name):
 alternate_name = re.sub('_','-',container_name)
 logging.info("Adding alternate name %s to %s", alternate_name, container_name)
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname), "UTF-8"))
 nsupdate.stdin.write(bytes(zone_update_add_alias_template.format(alternate_name, args.domain, container_hostname,container_id_60), "UTF-8"))
 nsupdate.stdin.write(bytes("send\n", "UTF-8"))
 nsupdate.stdin.close()


def remove_container(container_id):
 logging.info("Destroying %s", container_id)
 short_id = container_id[:12]
 short_id = container_id[:60]
 record_to_delete = [short_id]
 logging.debug("Looking for alias to %s.%s", short_id, args.domain)

Expand DownExpand Up@@ -130,10 +131,10 @@ def remove_container(container_id):
 if line != '':
 text_line = line.decode().rstrip()
 logging.debug("Read line %s", text_line)
 m = re.search(r"\s+([0-9a-f]{64}):.*\s+([a-z]+)\s*$", text_line)
 m = re.search(r".*\s+container\s+([a-z]+)\s+([0-9a-f]{64}).*$", text_line)
 if m:
 event = m.group(2)
 container_id = m.group(1)
 event = m.group(1)
 container_id = m.group(2)
 logging.debug("Got event %s for container %s", event, container_id)

 if event == "start":
Expand All@@ -146,3 +147,6 @@ def remove_container(container_id):

# 2014-11-28T15:32:04.000000000+01:00 a3d66b00acc9adbdbdbc91cc664d2d94b6a07cc4295c5cf54fcc595e2aa92a43: (from mongo:latest) restart
# 2015-03-05T08:36:14.000000000+01:00 eb75c1a5ad836d008b0fd66bf6b1ea353510175e8caa619e59d9851029b1ceca: (from ggtools/zabbix-server:latest) exec_start: ifconfig eth0

# docker Version: 1.12.1 
# 2017-01-11T20:46:26.268651386-05:00 container start bc340bc76860452fb99ce15101765107f0cf32005e9fcb3261407d81d247307d (image=ubuntu:14.04, name=toto)

37 changes: 37 additions & 0 deletions
systemd/Ubuntu/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on Ubuntu (16.04)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/default/
4. Edit file /etc/default/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/Ubuntu/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/Ubuntu/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/default/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target

37 changes: 37 additions & 0 deletions
systemd/archLinux/README.mkd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@

# Install 

This configuration was tested on ArchLinux (2017-01-09)

1. copy dockerDDNS.py into /usr/local/sbin/
2. Change permission to let root execute file (chmod 766 /usr/local/sbin/dockerDDNS.py)
2. copy dockerDDNS.service into /etc/systemd/system
3. finaly copy dockerDDNS into /etc/conf.d/
4. Edit file /etc/conf.d/dockerDDNS , fix Variables for your needs
5. reload systemd configuration file (sudo systemctl daemon-reload)

Installation complet, It's time to TRY :D

1. Validation systemd have the new configuration

 $ systemctl list-unit-files | grep dockerDDN
 dockerDDNS.service disabled
2. Try to start the new service 

 $ systemctl start dockerDDNS.service
3. View the status and fix it problems

 $ systemctl status dockerDDNS.service
 dockerDDNS.service - Update a dynamic DNS when Docker starts containers
 Loaded: loaded (/etc/systemd/system/dockerDDNS.service; disabled; vendor preset: disabled)
 Active: active (running) since Mon 2017-01-09 16:43:21 EST; 4s ago
 Main PID: 2067 (python3)
 Tasks: 7 (limit: 4915)
 Memory: 33.4M
 CPU: 263ms
 CGroup: /system.slice/dockerDDNS.service
 ├─2067 python3 /usr/local/sbin/dockerDDNS.py --key /tmp/bind/key.private --domain dck.example.com. --server 127.0.0.1
 └─2083 docker events
4. Double check, just to be sure :D

 $ ps aux | grep dockerDDNS

12 changes: 12 additions & 0 deletions
systemd/archLinux/dockerDDNS

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
# Configuration file for the DockerDDNS service
# REF : https://github.com/ggtools/docker-tools

# DNS key to update bind9 server
DDNS_UPDATE_KEY=/etc/bind/keys/Kdck.example.com.+157+31514.private

# domain to update
DOMAIN=dck.example.com

# DNS server
DNS_SERVER=127.0.0.1


13 changes: 13 additions & 0 deletions
systemd/archLinux/dockerDDNS.service

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Update a dynamic DNS when Docker starts containers
After=docker.service
Requires=docker.service

[Service]
EnvironmentFile=/etc/conf.d/dockerDDNS
ExecStart=/usr/local/sbin/dockerDDNS.py --key $DDNS_UPDATE_KEY --domain $DOMAIN --server $DNS_SERVER --catchup
PIDFile=/var/run/dockerDDNS
KillMode=process

[Install]
WantedBy=default.target