Upgrade the NAT docker to bookworm (sonic-net#18799)

* Upgrade the NAT docker to bookworm Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com> * Corrected the iptables Makefile Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com> * Updated the fullcone patch for iptables 1.8.9 version Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com> --------- Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com>
liushilongbuaa · Apr 30, 2024 · cad0268 · cad0268
1 parent 0cfb024
commit cad0268
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 278 deletions.
diff --git a/dockers/docker-nat/Dockerfile.j2 b/dockers/docker-nat/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, copy_files %}
-FROM docker-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk
@@ -7,11 +7,11 @@ DOCKER_NAT_DBG = $(DOCKER_NAT_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_NAT)_PATH = $(DOCKERS_PATH)/$(DOCKER_NAT_STEM)
 
 $(DOCKER_NAT)_DEPENDS += $(SWSS) $(IPTABLESIP4TC) $(IPTABLESIP6TC) $(IPTABLESIPTC) $(IPXTABLES12) $(IPTABLES)
-$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_DEPENDS)
+$(DOCKER_NAT)_DBG_DEPENDS = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_DEPENDS)
 $(DOCKER_NAT)_DBG_DEPENDS += $(SWSS_DBG) $(LIBSWSSCOMMON_DBG)
-$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BULLSEYE)_DBG_IMAGE_PACKAGES)
+$(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_SWSS_LAYER_BOOKWORM)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
+$(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
 
 $(DOCKER_NAT)_VERSION = 1.0.0
 $(DOCKER_NAT)_PACKAGE_NAME = nat
@@ -38,5 +38,5 @@ $(DOCKER_NAT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
 
 $(DOCKER_NAT)_BASE_IMAGE_FILES += natctl:/usr/bin/natctl
 
-SONIC_BULLSEYE_DOCKERS += $(DOCKER_NAT)
-SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_NAT_DBG)
+SONIC_BOOKWORM_DOCKERS += $(DOCKER_NAT)
+SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_NAT_DBG)
diff --git a/rules/iptables.mk b/rules/iptables.mk
@@ -1,7 +1,7 @@
 # iptables package
 
-IPTABLES_VERSION = 1.8.7
-IPTABLES_VERSION_SUFFIX = 1
+IPTABLES_VERSION = 1.8.9
+IPTABLES_VERSION_SUFFIX = 2
 IPTABLES_VERSION_FULL = $(IPTABLES_VERSION)-$(IPTABLES_VERSION_SUFFIX)
 
 IPTABLES = iptables_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb

diff --git a/src/iptables/Makefile b/src/iptables/Makefile
@@ -11,7 +11,7 @@ DERIVED_TARGETS = libip4tc2_$(IPTABLES_VERSION_FULL)_$(CONFIGURED_ARCH).deb \
 IPTABLES_URL = http://deb.debian.org/debian/pool/main/i/iptables
 
 DSC_FILE = iptables_$(IPTABLES_VERSION_FULL).dsc
-ORIG_FILE = iptables_$(IPTABLES_VERSION).orig.tar.bz2
+ORIG_FILE = iptables_$(IPTABLES_VERSION).orig.tar.xz
 DEBIAN_FILE = iptables_$(IPTABLES_VERSION_FULL).debian.tar.xz
 
 DSC_FILE_URL = $(IPTABLES_URL)/$(DSC_FILE)