File tree 3 files changed +6
-8
lines changed
3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change 2
2
3
3
NOJESSIE ?= 1
4
4
NOSTRETCH ?= 1
5
- NOBUSTER ?= 0
6
- NOBULLSEYE ?= 0
5
+ NOBUSTER ?= 1
6
+ NOBULLSEYE ?= 1
7
7
NOBOOKWORM ?= 0
8
8
9
9
override Q := @
Original file line number Diff line number Diff line change @@ -46,7 +46,7 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
46
46
$(UPDATE_CHASSISDB_CONFIG_SCRIPT ) \
47
47
$(COPP_CONFIG_TEMPLATE )
48
48
49
- $(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BULLSEYE )
49
+ $(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_SWSS_LAYER_BOOKWORM )
50
50
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS )
51
51
52
- SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_VS )
52
+ SONIC_BOOKWORM_DOCKERS += $(DOCKER_SONIC_VS )
Original file line number Diff line number Diff line change 1
1
{% from "dockers/dockerfile-macros.j2" import install_debian_packages , install_python_wheels , copy_files %}
2
- FROM docker-swss-layer-bullseye -{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
2
+ FROM docker-swss-layer-bookworm -{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
3
3
4
4
ARG docker_container_name
5
5
@@ -18,7 +18,7 @@ RUN apt-get install -y net-tools \
18
18
tcpdump \
19
19
ifupdown \
20
20
bridge-utils \
21
- python -ply \
21
+ python3 -ply \
22
22
libqt5core5a \
23
23
libqt5network5 \
24
24
libgmp10 \
@@ -69,8 +69,6 @@ RUN apt-get install -y net-tools \
69
69
libgssrpc4 \
70
70
libkdb5-10
71
71
72
- RUN apt-get install -y -t bullseye-backports iproute2
73
-
74
72
# For sonic-config-engine Python 3 package
75
73
# Install pyangbind here, outside sonic-config-engine dependencies, as pyangbind causes enum34 to be installed.
76
74
# Then immediately uninstall enum34, as enum34 should not be installed for Python >= 3.4, as it causes a
You can’t perform that action at this time.
0 commit comments