Skip to content

Commit cae6772

Browse files
authored
[docker-database]: Upgrade docker-database to buster (#4665)
Signed-off-by: Joyas Joseph <[email protected]>
1 parent 9863b76 commit cae6772

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

dockers/docker-database/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
2-
FROM docker-config-engine-stretch
2+
FROM docker-config-engine-buster
33

44
ARG docker_container_name
55
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf

rules/docker-database.mk

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,18 @@ DOCKER_DATABASE_DBG = $(DOCKER_DATABASE_STEM)-$(DBG_IMAGE_MARK).gz
77
$(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/$(DOCKER_DATABASE_STEM)
88

99
$(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
10-
$(DOCKER_DATABASE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_DEPENDS)
10+
$(DOCKER_DATABASE)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
1111
$(DOCKER_DATABASE)_DBG_DEPENDS += $(REDIS_TOOLS_DBG)
1212

13-
$(DOCKER_DATABASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_PACKAGES)
13+
$(DOCKER_DATABASE)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
1414

15-
$(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
15+
$(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
1616

1717
SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE)
1818
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE)
19-
SONIC_STRETCH_DOCKERS += $(DOCKER_DATABASE)
2019

2120
SONIC_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG)
2221
SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG)
23-
SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_DATABASE_DBG)
2422

2523
$(DOCKER_DATABASE)_CONTAINER_NAME = database
2624
$(DOCKER_DATABASE)_RUN_OPT += --privileged -t

0 commit comments

Comments
 (0)