Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion utils/localstack_extensions/utils/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import requests

from localstack.config import is_env_true
from localstack.pro.core.utils.container.registry_strategies import CustomizableRegistryStrategy
from localstack_extensions.utils.h2_proxy import (
apply_http2_patches_for_grpc_support,
)
Expand Down Expand Up @@ -103,7 +104,7 @@ def __init__(
http2_ports: list[int] | None = None,
tcp_ports: list[int] | None = None,
):
self.image_name = image_name
self.image_name = CustomizableRegistryStrategy().resolve(image_name)
if not container_ports:
raise ValueError("container_ports is required")
self.container_ports = container_ports
Expand Down
8 changes: 6 additions & 2 deletions wiremock/localstack_wiremock/extension.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
ENV_WIREMOCK_API_TOKEN = "WIREMOCK_API_TOKEN"
# Host path to directory containing .wiremock/ (required for runner mode)
ENV_WIREMOCK_CONFIG_DIR = "WIREMOCK_CONFIG_DIR"
# Override the OSS image (default: wiremock/wiremock); accepts full ref with optional tag
ENV_WIREMOCK_IMAGE = "WIREMOCK_IMAGE"
# Override the runner image (default: wiremock/wiremock-runner); accepts full ref with optional tag
ENV_WIREMOCK_IMAGE_RUNNER = "WIREMOCK_IMAGE_RUNNER"

SERVICE_PORT = 8080 # Mock API port
ADMIN_PORT = 9999 # Admin interface port (runner mode)
Expand All @@ -29,7 +33,7 @@ class WireMockExtension(ProxiedDockerContainerExtension):

def __init__(self):
env_vars = {}
image_name = self.DOCKER_IMAGE
image_name = os.getenv(ENV_WIREMOCK_IMAGE) or self.DOCKER_IMAGE
volumes = None
container_ports = [SERVICE_PORT]
health_check_path = "/__admin/health"
Expand All @@ -41,7 +45,7 @@ def __init__(self):
env_vars["WMC_ADMIN_PORT"] = str(ADMIN_PORT)
env_vars["WMC_API_TOKEN"] = api_token
env_vars["WMC_RUNNER_ENABLED"] = "true"
image_name = self.DOCKER_IMAGE_RUNNER
image_name = os.getenv(ENV_WIREMOCK_IMAGE_RUNNER) or self.DOCKER_IMAGE_RUNNER
container_ports = [SERVICE_PORT, ADMIN_PORT]
health_check_path = "/__/health"
health_check_retries = 90
Expand Down
Loading