From 329606db17ecb23ffe2175b0d0aa580746229106 Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Wed, 1 Jul 2020 10:28:53 -0700 Subject: [PATCH] Address Review Comments. --- dockers/docker-database/Dockerfile.j2 | 2 +- files/build_templates/docker_image_ctl.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2 index a3b9ede690bf..58b92fa8cfa5 100644 --- a/dockers/docker-database/Dockerfile.j2 +++ b/dockers/docker-database/Dockerfile.j2 @@ -37,7 +37,7 @@ COPY ["docker-database-init.sh", "/usr/local/bin/"] COPY ["database_config.json.j2", "/usr/share/sonic/templates/"] COPY ["database_global.json.j2", "/usr/share/sonic/templates/"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] -COPY ["files/sysctl-net.conf", "/etc/sysctl.conf"] +COPY ["files/sysctl-net.conf", "/etc/sysctl.d/"] COPY ["critical_processes", "/etc/supervisor"] ENTRYPOINT ["/usr/local/bin/docker-database-init.sh"] diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2 index 2ad400ff3710..5348b9b78a80 100644 --- a/files/build_templates/docker_image_ctl.j2 +++ b/files/build_templates/docker_image_ctl.j2 @@ -74,7 +74,7 @@ function postStartAction() { {%- if docker_container_name == "database" %} if [ "$DEV" ]; then - docker exec -i database$DEV sysctl -p -e + docker exec -i database$DEV sysctl --system -e link_namespace $DEV fi