From 3e12c6b616de9c640c08d92d731a1edfa843665f Mon Sep 17 00:00:00 2001
From: zjswhhh <zhangjing@microsoft.com>
Date: Thu, 7 Apr 2022 20:07:56 +0000
Subject: [PATCH 1/3] upgrade to bullseye

---
 dockers/docker-mux/Dockerfile.j2 | 2 +-
 rules/docker-mux.mk              | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dockers/docker-mux/Dockerfile.j2 b/dockers/docker-mux/Dockerfile.j2
index 66ec315f0809..2695cc95ac83 100755
--- a/dockers/docker-mux/Dockerfile.j2
+++ b/dockers/docker-mux/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-buster
+FROM docker-config-engine-bulleyes
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk
index 31c3212ea11f..55e410fb448e 100644
--- a/rules/docker-mux.mk
+++ b/rules/docker-mux.mk
@@ -7,12 +7,12 @@ DOCKER_MUX_DBG = $(DOCKER_MUX_STEM)-$(DBG_IMAGE_MARK).gz
 $(DOCKER_MUX)_PATH = $(DOCKERS_PATH)/$(DOCKER_MUX_STEM)
 
 $(DOCKER_MUX)_DEPENDS = $(SONIC_LINKMGRD) $(LIBSWSSCOMMON) $(LIBHIREDIS)
-$(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
+$(DOCKER_MUX)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
 $(DOCKER_MUX)_DBG_DEPENDS += $(SONIC_LINKMGRD_DBG) $(LIBSWSSCOMMON_DBG) $(LIBHIREDIS_DBG)
 
-$(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
+$(DOCKER_MUX)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
 
-$(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BUSTER)
+$(DOCKER_MUX)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE_BULLSEYE)
 
 $(DOCKER_MUX)_VERSION = 1.0.0
 $(DOCKER_MUX)_PACKAGE_NAME = mux
@@ -34,6 +34,3 @@ $(DOCKER_MUX)_RUN_OPT += --privileged -t
 $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/mux:/var/log/mux:rw
 $(DOCKER_MUX)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
-
-SONIC_BUSTER_DOCKERS += $(DOCKER_MUX)
-SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_MUX_DBG)

From 64d9b5ede2fb4fe744ae0695e22163e0652f2bba Mon Sep 17 00:00:00 2001
From: zjswhhh <zhangjing@microsoft.com>
Date: Thu, 7 Apr 2022 20:09:42 +0000
Subject: [PATCH 2/3] remove unused orchagent run opt

---
 rules/docker-mux.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk
index 55e410fb448e..cbdc1c06510d 100644
--- a/rules/docker-mux.mk
+++ b/rules/docker-mux.mk
@@ -32,5 +32,4 @@ endif
 $(DOCKER_MUX)_CONTAINER_NAME = mux
 $(DOCKER_MUX)_RUN_OPT += --privileged -t
 $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_ORCHAGENT)_RUN_OPT += -v /var/log/mux:/var/log/mux:rw
 $(DOCKER_MUX)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)

From df501b625ffb362066b02c7e6b5bb970e0ea12b3 Mon Sep 17 00:00:00 2001
From: zjswhhh <zhangjing@microsoft.com>
Date: Thu, 7 Apr 2022 20:25:08 +0000
Subject: [PATCH 3/3] fix typo

---
 dockers/docker-mux/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockers/docker-mux/Dockerfile.j2 b/dockers/docker-mux/Dockerfile.j2
index 2695cc95ac83..f7e1ee3b4454 100755
--- a/dockers/docker-mux/Dockerfile.j2
+++ b/dockers/docker-mux/Dockerfile.j2
@@ -1,5 +1,5 @@
 {% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
-FROM docker-config-engine-bulleyes
+FROM docker-config-engine-bullseye
 
 ARG docker_container_name
 RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf