Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Managed docker network #8412

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

Closed
wants to merge 3 commits into from
Closed

Managed docker network #8412

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
b4208b7
Configure managed docker network with vars
simonrw May 31, 2023
97ae323
Set up managed docker network
simonrw May 31, 2023
0f1b2e0
Add configuration to example compose files
simonrw Jun 1, 2023
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
1 change: 1 addition & 0 deletions docker-compose-pro.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ services:
- PERSISTENCE=${PERSISTENCE-}
- LOCALSTACK_API_KEY=${LOCALSTACK_API_KEY-} # required for Pro
- DOCKER_HOST=unix:///var/run/docker.sock
# - USE_MANAGED_DOCKER_NETWORK=1 # allow LocalStack to manage networking
volumes:
- "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
- "/var/run/docker.sock:/var/run/docker.sock"
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
environment:
- DEBUG=${DEBUG-}
- DOCKER_HOST=unix:///var/run/docker.sock
# - USE_MANAGED_DOCKER_NETWORK=1 # allow LocalStack to manage networking
volumes:
- "${LOCALSTACK_VOLUME_DIR:-./volume}:/var/lib/localstack"
- "/var/run/docker.sock:/var/run/docker.sock"
14 changes: 14 additions & 0 deletions localstack/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,13 @@ def get_gateway_listen(gateway_listen: str) -> List[HostAndPort]:
os.environ.get("BUCKET_MARKER_LOCAL", "").strip() or DEFAULT_BUCKET_MARKER_LOCAL
)

# Create managed docker network
USE_MANAGED_DOCKER_NETWORK = is_env_true("USE_MANAGED_DOCKER_NETWORK")
MANAGED_DOCKER_NETWORK_NAME = os.environ.get(
"MANAGED_DOCKER_NETWORK_NAME",
"lsnet",
)

# PUBLIC: bridge (Docker default)
# Docker network driver for the Lambda and ECS containers. https://docs.docker.com/network/
LAMBDA_DOCKER_NETWORK = os.environ.get("LAMBDA_DOCKER_NETWORK", "").strip()
Expand Down Expand Up @@ -1120,6 +1127,7 @@ def get_gateway_listen(gateway_listen: str) -> List[HostAndPort]:
"LS_LOG",
"MAIN_CONTAINER_NAME",
"MAIN_DOCKER_NETWORK",
"MANAGED_DOCKER_NETWORK_NAME",
"OPENSEARCH_ENDPOINT_STRATEGY",
"OUTBOUND_HTTP_PROXY",
"OUTBOUND_HTTPS_PROXY",
Expand Down Expand Up @@ -1147,6 +1155,7 @@ def get_gateway_listen(gateway_listen: str) -> List[HostAndPort]:
"TEST_IAM_USER_ID",
"TEST_IAM_USER_NAME",
"TF_COMPAT_MODE",
"USE_MANAGED_DOCKER_NETWORK",
"USE_SINGLE_REGION",
"USE_SSL",
"WAIT_FOR_DEBUGGER",
Expand Down Expand Up @@ -1312,3 +1321,8 @@ def init_directories() -> Directories:
# initialize directories
dirs: Directories
dirs = init_directories()

# merge docker networks if required
if USE_MANAGED_DOCKER_NETWORK:
LAMBDA_DOCKER_NETWORK = MANAGED_DOCKER_NETWORK_NAME
MAIN_DOCKER_NETWORK = MANAGED_DOCKER_NETWORK_NAME
17 changes: 17 additions & 0 deletions localstack/utils/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from localstack.utils.container_networking import get_main_container_name
from localstack.utils.container_utils.container_client import (
ContainerException,
NoSuchNetwork,
PortMappings,
SimpleVolumeBind,
VolumeBind,
Expand Down Expand Up @@ -554,13 +555,29 @@ def configure_container(container: LocalstackContainer):
# mount docker socket
container.volumes.append((config.DOCKER_SOCK, config.DOCKER_SOCK))

# if using managed networking, set up the docker network
if config.USE_MANAGED_DOCKER_NETWORK:
setup_managed_docker_network(container)

container.privileged = True


def configure_volume_mounts(container: LocalstackContainer):
container.volumes.add(VolumeBind(config.VOLUME_DIR, DEFAULT_VOLUME_DIR))


def setup_managed_docker_network(container: LocalstackContainer):
ensure_docker_network(config.MANAGED_DOCKER_NETWORK_NAME)
container.network = config.MANAGED_DOCKER_NETWORK_NAME


def ensure_docker_network(network_name: str):
try:
DOCKER_CLIENT.inspect_network(network_name)
except NoSuchNetwork:
DOCKER_CLIENT.create_network(network_name)


@log_duration()
def prepare_host(console):
"""
Expand Down
2 changes: 1 addition & 1 deletion localstack/utils/container_utils/docker_cmd_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ def _inspect_object(self, object_name_or_id: str) -> Dict[str, Union[dict, list,
cmd = self._docker_cmd()
cmd += ["inspect", "--format", "{{json .}}", object_name_or_id]
try:
cmd_result = run(cmd)
cmd_result = run(cmd, stderr=subprocess.PIPE)
except subprocess.CalledProcessError as e:
# note: case-insensitive comparison, to support Docker and Podman output formats
if "no such object" in to_str(e.stdout).lower():
Expand Down