m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove ip address from port mapping command

This commit is contained in:
zhongyh16 2017-07-24 15:33:24 +08:00
parent f987ad2d5b
commit 7d5ec47dbb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nettools.py
View File

@ -358,8 +358,7 @@ class portcontrol(object):
allocated_ports[container_name] = free_port allocated_ports[container_name] = free_port
public_ip = env.getenv("PUBLIC_IP") public_ip = env.getenv("PUBLIC_IP")
try: try:
subprocess.run(['iptables','-t','nat','-A','PREROUTING','-d',public_ip,'-p','tcp','--dport',str(free_port),"-j","DNAT",'--to-destination','%s:%s'%(container_ip,container_port)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True) subprocess.run(['iptables','-t','nat','-A','PREROUTING','-p','tcp','--dport',str(free_port),"-j","DNAT",'--to-destination','%s:%s'%(container_ip,container_port)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
subprocess.run(['iptables','-t','nat','-A','POSTROUTING','-d',container_ip,'-p','tcp','--dport',str(container_port),"-j","SNAT",'--to',public_ip], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
return [True, str(free_port)] return [True, str(free_port)]
except subprocess.CalledProcessError as suberror: except subprocess.CalledProcessError as suberror:
return [False, "set port mapping failed : %s" % suberror.stdout.decode('utf-8')] return [False, "set port mapping failed : %s" % suberror.stdout.decode('utf-8')]
@ -373,8 +372,7 @@ class portcontrol(object):
free_port = allocated_ports[container_name] free_port = allocated_ports[container_name]
public_ip = env.getenv("PUBLIC_IP") public_ip = env.getenv("PUBLIC_IP")
try: try:
subprocess.run(['iptables','-t','nat','-D','PREROUTING','-d',public_ip,'-p','tcp','--dport',str(free_port),"-j","DNAT",'--to-destination','%s:%s'%(container_ip,container_port)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True) subprocess.run(['iptables','-t','nat','-D','PREROUTING','-p','tcp','--dport',str(free_port),"-j","DNAT",'--to-destination','%s:%s'%(container_ip,container_port)], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
subprocess.run(['iptables','-t','nat','-D','POSTROUTING','-d',container_ip,'-p','tcp','--dport',str(container_port),"-j","SNAT",'--to',public_ip], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, check=True)
except subprocess.CalledProcessError as suberror: except subprocess.CalledProcessError as suberror:
return [False, "release port mapping failed : %s" % suberror.stdout.decode('utf-8')] return [False, "release port mapping failed : %s" % suberror.stdout.decode('utf-8')]
free_ports[free_port] = True free_ports[free_port] = True