diff --git a/main.star b/main.star index a539c1f54..d4d47ee7f 100644 --- a/main.star +++ b/main.star @@ -520,6 +520,7 @@ def run(plan, args={}): mev_endpoint_names, args_with_right_defaults.port_publisher, index, + args_with_right_defaults.docker_cache_params, ) plan.print("Successfully launched dora") elif additional_service == "dugtrio": @@ -691,6 +692,7 @@ def run(plan, args={}): args_with_right_defaults.port_publisher, index, global_node_selectors, + args_with_right_defaults.docker_cache_params, ) plan.print("Successfully launched assertoor") elif additional_service == "custom_flood": diff --git a/src/assertoor/assertoor_launcher.star b/src/assertoor/assertoor_launcher.star index e82c21017..fac87d0b0 100644 --- a/src/assertoor/assertoor_launcher.star +++ b/src/assertoor/assertoor_launcher.star @@ -39,6 +39,7 @@ def launch_assertoor( port_publisher, index, global_node_selectors, + docker_cache_params, ): all_client_info = [] clients_with_validators = [] @@ -112,6 +113,7 @@ def launch_assertoor( assertoor_params, public_ports, global_node_selectors, + docker_cache_params, ) plan.add_service(SERVICE_NAME, config) @@ -124,6 +126,7 @@ def get_config( assertoor_params, public_ports, node_selectors, + docker_cache_params, ): config_file_path = shared_utils.path_join( ASSERTOOR_CONFIG_MOUNT_DIRPATH_ON_SERVICE, @@ -132,10 +135,22 @@ def get_config( IMAGE_NAME = assertoor_params.image - if assertoor_params.image == constants.DEFAULT_ASSERTOOR_IMAGE: + default_assertoor_image = ( + docker_cache_params.url + + (docker_cache_params.dockerhub_prefix if docker_cache_params.enabled else "") + + constants.DEFAULT_ASSERTOOR_IMAGE + ) + if assertoor_params.image == default_assertoor_image: if network_params.fulu_fork_epoch < constants.FAR_FUTURE_EPOCH: - IMAGE_NAME = "ethpandaops/assertoor:fulu-support" - + IMAGE_NAME = ( + docker_cache_params.url + + ( + docker_cache_params.dockerhub_prefix + if docker_cache_params.enabled + else "" + ) + + "ethpandaops/assertoor:fulu-support" + ) return ServiceConfig( image=IMAGE_NAME, ports=USED_PORTS, diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star index ad9939aa0..10b03b416 100644 --- a/src/dora/dora_launcher.star +++ b/src/dora/dora_launcher.star @@ -38,6 +38,7 @@ def launch_dora( mev_endpoint_names, port_publisher, additional_service_index, + docker_cache_params, ): all_cl_client_info = [] all_el_client_info = [] @@ -95,6 +96,7 @@ def launch_dora( global_node_selectors, port_publisher, additional_service_index, + docker_cache_params, ) plan.add_service(SERVICE_NAME, config) @@ -107,6 +109,7 @@ def get_config( node_selectors, port_publisher, additional_service_index, + docker_cache_params, ): config_file_path = shared_utils.path_join( DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE, @@ -122,16 +125,44 @@ def get_config( IMAGE_NAME = dora_params.image env_vars = dora_params.env - if dora_params.image == constants.DEFAULT_DORA_IMAGE: + default_dora_image = ( + docker_cache_params.url + + (docker_cache_params.dockerhub_prefix if docker_cache_params.enabled else "") + + constants.DEFAULT_DORA_IMAGE + ) + if dora_params.image == default_dora_image: if network_params.fulu_fork_epoch < constants.FAR_FUTURE_EPOCH: - IMAGE_NAME = "ethpandaops/dora:fulu-support" + IMAGE_NAME = ( + docker_cache_params.url + + ( + docker_cache_params.dockerhub_prefix + if docker_cache_params.enabled + else "" + ) + + "ethpandaops/dora:fulu-support" + ) env_vars["FRONTEND_SHOW_SENSITIVE_PEER_INFOS"] = "true" env_vars["FRONTEND_SHOW_PEER_DAS_INFOS"] = "true" if network_params.eip7732_fork_epoch < constants.FAR_FUTURE_EPOCH: - IMAGE_NAME = "ethpandaops/dora:eip7732-support" + IMAGE_NAME = ( + docker_cache_params.url + + ( + docker_cache_params.dockerhub_prefix + if docker_cache_params.enabled + else "" + ) + + "ethpandaops/dora:eip7732-support" + ) if network_params.eip7805_fork_epoch < constants.FAR_FUTURE_EPOCH: - IMAGE_NAME = "ethpandaops/dora:eip7805-support" - + IMAGE_NAME = ( + docker_cache_params.url + + ( + docker_cache_params.dockerhub_prefix + if docker_cache_params.enabled + else "" + ) + + "ethpandaops/dora:eip7805-support" + ) return ServiceConfig( image=IMAGE_NAME, ports=USED_PORTS,