From d82e1321bcdfb15ad06268aaa52fca40767a8fdc Mon Sep 17 00:00:00 2001 From: Vivek Date: Mon, 28 Nov 2022 08:57:26 -0800 Subject: [PATCH] [Bullseye] Upgrade sonic-sdk image to bullseye (#12649) - Why I did it Upgrade the app-extension developer environments (sonic-sdk & sonic-sdk-bullseye) to bullseye - How to verify it Built an app-extension using these images and verified if it is up and running. Signed-off-by: Vivek Reddy --- dockers/docker-sonic-sdk/Dockerfile.j2 | 2 +- rules/docker-sonic-sdk-buildenv.mk | 4 ++-- rules/docker-sonic-sdk.mk | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dockers/docker-sonic-sdk/Dockerfile.j2 b/dockers/docker-sonic-sdk/Dockerfile.j2 index dc28822cfd..0c5c765491 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-buildenv.mk b/rules/docker-sonic-sdk-buildenv.mk index fc3ee9fac9..8410d2d12c 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_BULLSEYE_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV_DBG) diff --git a/rules/docker-sonic-sdk.mk b/rules/docker-sonic-sdk.mk index d1253aeb1f..3c3e0b0f7b 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) @@ -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_BULLSEYE_DOCKERS += $(DOCKER_SONIC_SDK) +SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SONIC_SDK_DBG)