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

Fix service and container name to be same (#4151)

Browse Source
This commit is contained in:
Prince Sunny 2020-02-14 11:08:57 -08:00 committed by GitHub
parent 4b42a48f45
commit 31fb631cd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/init_cfg.json.j2
View File

@ -25,7 +25,7 @@
{% endfor %} {% endfor %}
}, },
"CONTAINER_FEATURE": { "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"] %} "snmp", "swss", "syncd", "teamd", "telemetry"] %}
"{{container}}": { "{{container}}": {
"auto_restart": "disabled", "auto_restart": "disabled",

2
rules/docker-restapi.mk
View File

@ -16,7 +16,7 @@ SONIC_STRETCH_DOCKERS += $(DOCKER_RESTAPI)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_RESTAPI) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_RESTAPI)
endif 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 += --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 += -v /var/run/redis/redis.sock:/var/run/redis/redis.sock
$(DOCKER_RESTAPI)_RUN_OPT += -p=8090:8090/tcp $(DOCKER_RESTAPI)_RUN_OPT += -p=8090:8090/tcp