Support bullseye for docker-sonic-restapi docker-sonic-telemetry (#9791)
Support bullseye for docker-sonic-restapi docker-sonic-telemetry Upgrade to bullseye and Golang-1.15 to support FIPS.
This commit is contained in:
parent
20f7ae853b
commit
7a226ffd0d
@ -1,5 +1,5 @@
|
||||
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
||||
FROM docker-config-engine-stretch
|
||||
FROM docker-config-engine-bullseye
|
||||
|
||||
ARG docker_container_name
|
||||
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name#%syslogtag%/;" /etc/rsyslog.conf
|
||||
|
@ -1,5 +1,5 @@
|
||||
{% from "dockers/dockerfile-macros.j2" import install_debian_packages, install_python_wheels, copy_files %}
|
||||
FROM docker-config-engine-buster
|
||||
FROM docker-config-engine-bullseye
|
||||
|
||||
ARG docker_container_name
|
||||
ARG image_version
|
||||
|
@ -8,14 +8,13 @@ $(DOCKER_RESTAPI)_DEPENDS += $(LIBHIREDIS) $(LIBNL3) $(LIBNL_GENL3) \
|
||||
|
||||
$(DOCKER_RESTAPI)_PATH = $(DOCKERS_PATH)/$(DOCKER_RESTAPI_STEM)
|
||||
|
||||
$(DOCKER_RESTAPI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
|
||||
$(DOCKER_RESTAPI)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
|
||||
|
||||
$(DOCKER_RESTAPI)_VERSION = 1.0.0
|
||||
$(DOCKER_RESTAPI)_PACKAGE_NAME = restapi
|
||||
|
||||
ifeq ($(INCLUDE_RESTAPI), y)
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_RESTAPI)
|
||||
SONIC_STRETCH_DOCKERS += $(DOCKER_RESTAPI)
|
||||
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_RESTAPI)
|
||||
endif
|
||||
|
||||
@ -26,5 +25,3 @@ $(DOCKER_RESTAPI)_RUN_OPT += -v /etc/sonic/credentials:/etc/sonic/credentials:ro
|
||||
$(DOCKER_RESTAPI)_RUN_OPT += -p=8081:8081/tcp
|
||||
|
||||
$(DOCKER_RESTAPI)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
|
||||
SONIC_BUSTER_DOCKERS += $(DOCKER_RESTAPI)
|
||||
|
@ -8,14 +8,14 @@ $(DOCKER_TELEMETRY)_PATH = $(DOCKERS_PATH)/$(DOCKER_TELEMETRY_STEM)
|
||||
|
||||
$(DOCKER_TELEMETRY)_DEPENDS += $(SONIC_MGMT_COMMON)
|
||||
$(DOCKER_TELEMETRY)_DEPENDS += $(SONIC_TELEMETRY)
|
||||
$(DOCKER_TELEMETRY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
|
||||
$(DOCKER_TELEMETRY)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_DEPENDS)
|
||||
|
||||
$(DOCKER_TELEMETRY)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
||||
$(DOCKER_TELEMETRY)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
|
||||
|
||||
$(DOCKER_TELEMETRY)_VERSION = 1.0.0
|
||||
$(DOCKER_TELEMETRY)_PACKAGE_NAME = telemetry
|
||||
|
||||
$(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
|
||||
$(DOCKER_TELEMETRY)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BULLSEYE)_DBG_IMAGE_PACKAGES)
|
||||
|
||||
SONIC_DOCKER_IMAGES += $(DOCKER_TELEMETRY)
|
||||
ifeq ($(INCLUDE_SYSTEM_TELEMETRY), y)
|
||||
@ -35,6 +35,3 @@ $(DOCKER_TELEMETRY)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw
|
||||
|
||||
$(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)
|
||||
$(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d
|
||||
|
||||
SONIC_BUSTER_DOCKERS += $(DOCKER_TELEMETRY)
|
||||
SONIC_BUSTER_DBG_DOCKERS += $(DOCKER_TELEMETRY_DBG)
|
||||
|
Loading…
Reference in New Issue
Block a user