Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 8 commits into from
Nov 28, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
852fd1c
[Bullseye] Upgrade sonic-sdk image to bullseye
vivekrnv Nov 8, 2022
deb1294
Merge branch 'sonic-net:master' into sonic_sdk_bullseye
vivekrnv Nov 9, 2022
74dcecb
Update rules
vivekrnv Nov 10, 2022
b588692
Merge branch 'sonic_sdk_bullseye' of github.com:vivekrnv/sonic-buildi…
vivekrnv Nov 10, 2022
043a0bd
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
vivekrnv Nov 10, 2022
09060cd
Merge branch 'sonic-net:master' into sonic_sdk_bullseye
vivekrnv Nov 10, 2022
d70c452
Updated naming
vivekrnv Nov 10, 2022
061be6a
Merge branch 'sonic_sdk_bullseye' of github.com:vivekrnv/sonic-buildi…
vivekrnv Nov 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-sonic-sdk/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions rules/docker-sonic-sdk-buildenv.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
10 changes: 5 additions & 5 deletions rules/docker-sonic-sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)