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

Fix bug: if all containers killed, service stop will throw exception because no redis (#2139)

Browse Source 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
This commit is contained in:
Qi Luo 2018-10-12 08:39:06 -07:00 committed by lguohan
parent cd1167d767
commit 7d51f8363f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/build_templates/docker_image_ctl.j2
View File

@ -39,6 +39,7 @@ function postStartAction()
{%- endif %} {%- endif %}
} }
start() {
# Obtain our platform as we will mount directories with these names in each docker # Obtain our platform as we will mount directories with these names in each docker
PLATFORM=`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform` PLATFORM=`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`
@ -50,7 +51,6 @@ HWSKU=""
HWSKU=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["hwsku"]'` HWSKU=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["hwsku"]'`
{%- endif %} {%- endif %}
start() {
DOCKERCHECK=`docker inspect --type container {{docker_container_name}} 2>/dev/null` DOCKERCHECK=`docker inspect --type container {{docker_container_name}} 2>/dev/null`
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
DOCKERMOUNT=`getMountPoint "$DOCKERCHECK"` DOCKERMOUNT=`getMountPoint "$DOCKERCHECK"`