Skip to content

Commit

Permalink
[build] Upgrade docker-sonic-vs from bullseye to bookworm.
Browse files Browse the repository at this point in the history
  • Loading branch information
liushilongbuaa committed Sep 14, 2024
1 parent b73d613 commit b8cd435
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

NOJESSIE ?= 1
NOSTRETCH ?= 1
NOBUSTER ?= 0
NOBULLSEYE ?= 0
NOBUSTER ?= 1
NOBULLSEYE ?= 1
NOBOOKWORM ?= 0

override Q := @
Expand Down
4 changes: 2 additions & 2 deletions platform/vs/docker-sonic-vs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
$(COPP_CONFIG_TEMPLATE)

$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE)
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM)
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)

SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_VS)
SONIC_BOOKWORM_DOCKERS += $(DOCKER_SONIC_VS)
6 changes: 2 additions & 4 deletions platform/vs/docker-sonic-vs/Dockerfile.j2
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-swss-layer-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
FROM docker-swss-layer-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}

ARG docker_container_name

Expand All @@ -18,7 +18,7 @@ RUN apt-get install -y net-tools \
tcpdump \
ifupdown \
bridge-utils \
python-ply \
python3-ply \
libqt5core5a \
libqt5network5 \
libgmp10 \
Expand Down Expand Up @@ -69,8 +69,6 @@ RUN apt-get install -y net-tools \
libgssrpc4 \
libkdb5-10

RUN apt-get install -y -t bullseye-backports iproute2

# For sonic-config-engine Python 3 package
# Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed.
# Then immediately uninstall enum34, as enum34 should not be installed for Python >= 3.4, as it causes a
Expand Down

0 comments on commit b8cd435

Please sign in to comment.