From 8d45352ac6812e4f29a26fd1eab36a7c4757713e Mon Sep 17 00:00:00 2001 From: Vivek Reddy Date: Fri, 4 Nov 2022 23:32:24 +0000 Subject: [PATCH 1/2] MIgrated docker to bullseye Signed-off-by: Vivek Reddy --- rules/docker-sonic-sdk-buildenv.mk | 4 ++-- rules/docker-sonic-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/docker-sonic-sdk-buildenv.mk b/rules/docker-sonic-sdk-buildenv.mk index fc3ee9fac98..67087976e19 100644 --- a/rules/docker-sonic-sdk-buildenv.mk +++ b/rules/docker-sonic-sdk-buildenv.mk @@ -28,5 +28,5 @@ $(DOCKER_SONIC_SDK_BUILDENV)_LOAD_DOCKERS += $(DOCKER_SONIC_SDK) SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV_DBG) -SONIC_BUSTER_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV) -SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV_DBG) +SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV) +SONIC_DOCKER_DBG_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV_DBG) diff --git a/rules/docker-sonic-sdk.mk b/rules/docker-sonic-sdk.mk index d1253aeb1fc..47cb08463b3 100644 --- a/rules/docker-sonic-sdk.mk +++ b/rules/docker-sonic-sdk.mk @@ -23,5 +23,5 @@ $(DOCKER_SONIC_SDK)_LABELS += com.azure.sonic.versions.libsairedis=$(LIBSAIREDIS $(DOCKER_SONIC_SDK)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) -SONIC_BUSTER_DOCKERS += $(DOCKER_SONIC_SDK) -SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SONIC_SDK_DBG) +SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK) +SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_DBG) From d7a0ee2f658e46face39b1ab245b4b813a4e40ab Mon Sep 17 00:00:00 2001 From: Vivek Reddy Date: Sat, 5 Nov 2022 00:28:17 +0000 Subject: [PATCH 2/2] bullseye changes made Signed-off-by: Vivek Reddy --- dockers/docker-sonic-sdk/Dockerfile.j2 | 2 +- rules/docker-sonic-sdk.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dockers/docker-sonic-sdk/Dockerfile.j2 b/dockers/docker-sonic-sdk/Dockerfile.j2 index dc28822cfd2..0c5c7654912 100755 --- a/dockers/docker-sonic-sdk/Dockerfile.j2 +++ b/dockers/docker-sonic-sdk/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-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} +FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} # Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive diff --git a/rules/docker-sonic-sdk.mk b/rules/docker-sonic-sdk.mk index 47cb08463b3..a38f95c4552 100644 --- a/rules/docker-sonic-sdk.mk +++ b/rules/docker-sonic-sdk.mk @@ -8,12 +8,12 @@ $(DOCKER_SONIC_SDK)_PATH = $(DOCKERS_PATH)/docker-sonic-sdk $(DOCKER_SONIC_SDK)_DEPENDS += $(LIBSAIREDIS) \ $(LIBSAIMETADATA) -$(DOCKER_SONIC_SDK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER) +$(DOCKER_SONIC_SDK)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE) -$(DOCKER_SONIC_SDK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS) \ +$(DOCKER_SONIC_SDK)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS) \ $(LIBSAIREDIS_DBG) \ $(LIBSAIMETADATA_DBG) -$(DOCKER_SONIC_SDK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES) +$(DOCKER_SONIC_SDK)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES) SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_DBG)