From 17d7f6ff4cf0caf05273d0fe9e91c659199d7d83 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Wed, 19 Feb 2020 17:25:26 -0800 Subject: [PATCH 1/2] Made Change to have Configurable option to enable/disable docker image --- rules/config | 3 +++ rules/docker-nat.mk | 4 ++++ slave.mk | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/rules/config b/rules/config index c8a24606f426..c168fa5a964e 100644 --- a/rules/config +++ b/rules/config @@ -107,3 +107,6 @@ ENABLE_MGMT_FRAMEWORK = y # ENABLE_RESTAPI - build docker-sonic-restapi for configuring the switch using REST APIs ENABLE_RESTAPI = n + +# ENABLE_NAT - build docker-sonic-nat for nat support +ENABLE_NAT = y diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk index f41c8f06647c..dcccc24ba2ff 100644 --- a/rules/docker-nat.mk +++ b/rules/docker-nat.mk @@ -13,13 +13,17 @@ $(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_P $(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) +ifeq ($(ENABLE_NAT), y) SONIC_DOCKER_IMAGES += $(DOCKER_NAT) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_NAT) SONIC_STRETCH_DOCKERS += $(DOCKER_NAT) +endif +ifeq ($(ENABLE_NAT), y) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_NAT_DBG) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_NAT_DBG) SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_NAT_DBG) +endif $(DOCKER_NAT)_CONTAINER_NAME = nat $(DOCKER_NAT)_RUN_OPT += --privileged -t diff --git a/slave.mk b/slave.mk index cc118da7aa06..71e6aeb3a866 100644 --- a/slave.mk +++ b/slave.mk @@ -116,6 +116,11 @@ ifeq ($(SONIC_ENABLE_SFLOW),y) ENABLE_SFLOW = y endif +ifeq ($(SONIC_ENABLE_NAT),y) +ENABLE_NAT = y +endif + + include $(RULES_PATH)/functions include $(RULES_PATH)/*.mk ifneq ($(CONFIGURED_PLATFORM), undefined) @@ -203,6 +208,7 @@ $(info "BUILD_TIMESTAMP" : "$(BUILD_TIMESTAMP)") $(info "BLDENV" : "$(BLDENV)") $(info "VS_PREPARE_MEM" : "$(VS_PREPARE_MEM)") $(info "ENABLE_SFLOW" : "$(ENABLE_SFLOW)") +$(info "ENABLE_NAT" : "$(ENABLE_NAT)") $(info ) ifeq ($(SONIC_USE_DOCKER_BUILDKIT),y) @@ -650,6 +656,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \ export enable_system_telemetry="$(ENABLE_SYSTEM_TELEMETRY)" export enable_restapi="$(ENABLE_RESTAPI)" export enable_ztp="$(ENABLE_ZTP)" + export enable_nat="$(ENABLE_NAT)" export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)" export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)" export installer_debs="$(addprefix $(STRETCH_DEBS_PATH)/,$($*_INSTALLS))" From af7da2ee5f9b95b8372c5f451ab318e3c6f3ab8c Mon Sep 17 00:00:00 2001 From: Abhishek Date: Thu, 20 Feb 2020 23:01:34 -0800 Subject: [PATCH 2/2] [Submodule-Update] sonic-utilities to latest master --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 5214a8d66eb4..ea374a7aa20e 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 5214a8d66eb48b536e0b95e4ddc3b9879d0ce49f +Subproject commit ea374a7aa20edb3a1c3040f5c40422b44f896f3c