matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Bullseye] Upgrade sonic-sdk image to bullseye (#12649)

Browse Source 
- 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 <vkarri@nvidia.com>
This commit is contained in:
Vivek 2022-11-28 08:57:26 -08:00 committed by GitHub
parent 80280e9cb7
commit d82e1321bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dockers/docker-sonic-sdk/Dockerfile.j2
View File

@ -1,5 +1,5 @@
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %} {% 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 # Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive

4
rules/docker-sonic-sdk-buildenv.mk
View File

@ -28,5 +28,5 @@ $(DOCKER_SONIC_SDK_BUILDENV)_LOAD_DOCKERS += $(DOCKER_SONIC_SDK)
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV) SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV_DBG) SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_BUILDENV_DBG)
SONIC_BUSTER_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV) SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV)
SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV_DBG) SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SONIC_SDK_BUILDENV_DBG)

10
rules/docker-sonic-sdk.mk
View File

@ -8,12 +8,12 @@ $(DOCKER_SONIC_SDK)_PATH = $(DOCKERS_PATH)/docker-sonic-sdk
$(DOCKER_SONIC_SDK)_DEPENDS += $(LIBSAIREDIS) \ $(DOCKER_SONIC_SDK)_DEPENDS += $(LIBSAIREDIS) \
$(LIBSAIMETADATA) $(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) \ $(LIBSAIREDIS_DBG) \
$(LIBSAIMETADATA_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_IMAGES += $(DOCKER_SONIC_SDK)
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_SONIC_SDK_DBG) 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) $(DOCKER_SONIC_SDK)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
SONIC_BUSTER_DOCKERS += $(DOCKER_SONIC_SDK) SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_SDK)
SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_SONIC_SDK_DBG) SONIC_BULLSEYE_DBG_DOCKERS += $(DOCKER_SONIC_SDK_DBG)