From 31fb631cd33451c21e1b2f89218193a53398ba1f Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Fri, 14 Feb 2020 11:08:57 -0800 Subject: [PATCH] Fix service and container name to be same (#4151) --- files/build_templates/init_cfg.json.j2 | 2 +- rules/docker-restapi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2 index bc2eff3ede..17617ee1a3 100644 --- a/files/build_templates/init_cfg.json.j2 +++ b/files/build_templates/init_cfg.json.j2 @@ -25,7 +25,7 @@ {% endfor %} }, "CONTAINER_FEATURE": { -{%- for container in ["bgp", "database", "dhcp_relay", "lldp", "pmon", "radv", "rest-api", "sflow", +{%- for container in ["bgp", "database", "dhcp_relay", "lldp", "pmon", "radv", "restapi", "sflow", "snmp", "swss", "syncd", "teamd", "telemetry"] %} "{{container}}": { "auto_restart": "disabled", diff --git a/rules/docker-restapi.mk b/rules/docker-restapi.mk index 7c02e0d4e4..2141dea64d 100644 --- a/rules/docker-restapi.mk +++ b/rules/docker-restapi.mk @@ -16,7 +16,7 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_RESTAPI) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_RESTAPI) endif -$(DOCKER_RESTAPI)_CONTAINER_NAME = rest-api +$(DOCKER_RESTAPI)_CONTAINER_NAME = restapi $(DOCKER_RESTAPI)_RUN_OPT += --cap-add NET_ADMIN --privileged -t $(DOCKER_RESTAPI)_RUN_OPT += -v /var/run/redis/redis.sock:/var/run/redis/redis.sock $(DOCKER_RESTAPI)_RUN_OPT += -p=8090:8090/tcp