[geode-native] branch develop updated: GEODE-8470: Properly stop running containers in SNI (#646)

[mmartell]

This is an automated email from the ASF dual-hosted git repository.

mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new 02f15f7  GEODE-8470: Properly stop running containers in SNI (#646)
02f15f7 is described below

commit 02f15f7a3fbce2a697aaba08d9175d2893356f9a
Author: M. Oleske <mole...@users.noreply.github.com>
AuthorDate: Mon Aug 31 08:44:19 2020 -0700

    GEODE-8470: Properly stop running containers in SNI (#646)
    
    -use docker system prune -f to clean up networks and stopped containers
---
 clicache/integration-test2/SNITests.cs | 4 ++--
 cppcache/integration/test/SNITest.cpp  | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/clicache/integration-test2/SNITests.cs 
b/clicache/integration-test2/SNITests.cs
index f23818b..f386359 100644
--- a/clicache/integration-test2/SNITests.cs
+++ b/clicache/integration-test2/SNITests.cs
@@ -58,10 +58,10 @@ namespace Apache.Geode.Client.IntegrationTests
         public void Dispose()
         {
 
-            var dockerComposeProc = Process.Start(@"docker-compose.exe", 
"stop");
+            var dockerComposeProc = Process.Start(@"docker-compose.exe", "-f " 
+ Config.SniConfigPath + "/docker-compose.yml" + " stop");
             dockerComposeProc.WaitForExit();
 
-            var dockerProc = Process.Start(@"docker.exe", "container prune 
-f");
+            var dockerProc = Process.Start(@"docker.exe", "system prune -f");
             dockerProc.WaitForExit();
 
         }
diff --git a/cppcache/integration/test/SNITest.cpp 
b/cppcache/integration/test/SNITest.cpp
index 0232bc6..2e362db 100644
--- a/cppcache/integration/test/SNITest.cpp
+++ b/cppcache/integration/test/SNITest.cpp
@@ -75,12 +75,15 @@ class SNITest : public ::testing::Test {
   }
 
   void TearDown() override {
-    auto systemRVal = std::system("docker-compose stop");
+    auto dockerComposeStopCommand = "docker-compose -f " +
+                                    sniConfigPath.string() +
+                                    "/docker-compose.yml" + " stop";
+    auto systemRVal = std::system(dockerComposeStopCommand.c_str());
     if (systemRVal == -1) {
       BOOST_LOG_TRIVIAL(error) << "std::system returned: " << systemRVal;
     }
 
-    systemRVal = std::system("docker container prune -f");
+    systemRVal = std::system("docker system prune -f");
     if (systemRVal == -1) {
       BOOST_LOG_TRIVIAL(error) << "std::system returned: " << systemRVal;
     }