Skip to content

Bug/docker network dns #368

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

Merged
jboddey merged 3 commits into from
Apr 5, 2024
Merged

Bug/docker network dns #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b09cd5d
Remove private network from network service containers
jhughesoti Apr 3, 2024
8f42e12
Remove private network creation and cleanup
jhughesoti Apr 3, 2024
d3043a1
Fix pylint
jboddey Apr 4, 2024
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
4 changes: 3 additions & 1 deletion cmd/prune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ fi
# Remove docker networks
echo Removing docker networks
sudo docker network rm endev0 > /dev/null
sudo docker network rm tr-private-net > /dev/null
# Private network not used, add cleanup
# back in if/when implemented
#sudo docker network rm tr-private-net > /dev/null
10 changes: 8 additions & 2 deletions framework/python/src/net_orc/network_orchestrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,9 @@ def create_net(self):
if 'CI' in os.environ:
self._ci_post_network_create()

self._create_private_net()
# Private network not used, disable until
# a use case is determined
#self._create_private_net()

# Listener may have already been created. Only create if not
if self._listener is None:
Expand Down Expand Up @@ -479,6 +481,7 @@ def _start_network_service(self, net_module):
network = 'host' if net_module.net_config.host else PRIVATE_DOCKER_NET
LOGGER.debug(f"""Network: {network}, image name: {net_module.image_name},
container name: {net_module.container_name}""")

try:
client = docker.from_env()
net_module.container = client.containers.run(
Expand All @@ -487,7 +490,10 @@ def _start_network_service(self, net_module):
cap_add=['NET_ADMIN'],
name=net_module.container_name,
hostname=net_module.container_name,
network=PRIVATE_DOCKER_NET,
# Undetermined version of docker seems to have broken
# DNS configuration (/etc/resolv.conf) Re-add when/if
# this network is utilized and DNS issue is resolved
#network=PRIVATE_DOCKER_NET,
privileged=True,
detach=True,
mounts=net_module.mounts,
Expand Down