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

[docker-sonic-vs]: upgrade docker-sonic-vs to buster (#4979)

Browse Source 
Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
lguohan 2020-07-18 00:11:09 -07:00 committed by GitHub
parent a3f4c31193
commit 25c3900085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/vs/docker-sonic-vs.mk
View File

@ -36,6 +36,5 @@ $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
$(QOS_CONFIG_TEMPLATE) \ $(QOS_CONFIG_TEMPLATE) \
$(SONIC_VERSION) $(SONIC_VERSION)
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH) $(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS) SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
SONIC_STRETCH_DOCKERS += $(DOCKER_SONIC_VS)

12
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -1,4 +1,4 @@
FROM docker-config-engine-stretch FROM docker-config-engine-buster
ARG docker_container_name ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
@ -13,7 +13,7 @@ RUN echo "deb http://packages.microsoft.com/repos/sonic-dev/ jessie main" >> /et
RUN apt-get update RUN apt-get update
RUN apt-get install -y net-tools \ RUN apt-get install -y net-tools \
redis-server=5:5.0.3-3~bpo9+2 \ redis-server=5:6.0.5-1~bpo10+1 \
arping \ arping \
ndisc6 \ ndisc6 \
ethtool \ ethtool \
@ -23,15 +23,15 @@ RUN apt-get install -y net-tools \
python-ply \ python-ply \
libqt5core5a \ libqt5core5a \
libqt5network5 \ libqt5network5 \
libboost-program-options1.62.0 \ libboost-program-options1.71.0 \
libboost-system1.62.0 \ libboost-system1.71.0 \
libboost-thread1.62.0 \ libboost-thread1.71.0 \
libgmp10 \ libgmp10 \
libjudydebian1 \ libjudydebian1 \
openssh-client \ openssh-client \
openssh-server \ openssh-server \
libc-ares2 \ libc-ares2 \
iproute \ iproute2 \
grub2-common \ grub2-common \
python-click \ python-click \
python-natsort \ python-natsort \