Add automatic container restart policy

80degreeswest · Feb 7, 2021 · 658937c · 658937c
1 parent 165ca45
commit 658937c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.eightydegreeswest</groupId>
 	<artifactId>bfmgr</artifactId>
-	<version>1.0.14</version>
+	<version>1.0.15</version>
 	<name>bfmgr</name>
 	<description>Buildfarm Manager</description>
 

diff --git a/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlLocal.java b/src/main/java/com/eightydegreeswest/bfmgr/service/impl/BfMgrCtrlLocal.java
@@ -20,6 +20,7 @@
 import com.github.dockerjava.api.model.ExposedPort;
 import com.github.dockerjava.api.model.HostConfig;
 import com.github.dockerjava.api.model.Ports;
+import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
@@ -153,7 +154,9 @@ public void createCluster(CreateClusterRequest createClusterRequest) throws IOEx
 
     CreateContainerResponse response = dockerClient.createContainerCmd(redisRepo + ":" + redisTag)
       .withName(redisContainer)
-      .withHostConfig(HostConfig.newHostConfig().withPortBindings(portBindings))
+      .withHostConfig(HostConfig.newHostConfig()
+        .withRestartPolicy(RestartPolicy.unlessStoppedRestart())
+        .withPortBindings(portBindings))
       .exec();
     dockerClient.startContainerCmd(response.getId()).exec();
 
@@ -163,6 +166,7 @@ public void createCluster(CreateClusterRequest createClusterRequest) throws IOEx
     response = dockerClient.createContainerCmd(createClusterRequest.getWorkerRepo() + ":" + createClusterRequest.getBuildfarmTag())
       .withName(workerContainer)
       .withHostConfig(HostConfig.newHostConfig()
+        .withRestartPolicy(RestartPolicy.unlessStoppedRestart())
         .withPortBindings(portBindings)
         .withPrivileged(true)
         .withBinds(Bind.parse("/tmp/buildfarm:/var/lib/buildfarm-shard-worker"), Bind.parse("/tmp/worker:/tmp/worker"))
@@ -177,6 +181,7 @@ public void createCluster(CreateClusterRequest createClusterRequest) throws IOEx
     response = dockerClient.createContainerCmd(createClusterRequest.getServerRepo() + ":" + createClusterRequest.getBuildfarmTag())
       .withName(serverContainer)
       .withHostConfig(HostConfig.newHostConfig()
+        .withRestartPolicy(RestartPolicy.unlessStoppedRestart())
         .withPortBindings(portBindings)
         .withBinds(Bind.parse("/tmp/buildfarm:/var/lib/buildfarm-server"))
         .withNetworkMode("host"))

diff --git a/src/main/resources/aws.json b/src/main/resources/aws.json
@@ -125,7 +125,7 @@
                     "Ref":"ServerTag"
                   },
                   "\n",
-                  "docker run --name buildfarm-server -p 8980:8980 -v /var/lib/buildfarm-server/server.config:/var/lib/buildfarm-server/server.config ",
+                  "docker run --restart unless-stopped --name buildfarm-server -p 8980:8980 -v /var/lib/buildfarm-server/server.config:/var/lib/buildfarm-server/server.config ",
                   {
                     "Ref":"ServerRepo"
                   },
@@ -237,7 +237,7 @@
                     "Ref":"WorkerTag"
                   },
                   "\n",
-                  "docker run -d --name buildfarm-worker --privileged -v /var/lib/buildfarm-shard-worker/worker.config:/var/lib/buildfarm-shard-worker/worker.config -v /tmp/worker:/tmp/worker -p 8981:8981 ",
+                  "docker run -d --restart unless-stopped --name buildfarm-worker --privileged -v /var/lib/buildfarm-shard-worker/worker.config:/var/lib/buildfarm-shard-worker/worker.config -v /tmp/worker:/tmp/worker -p 8981:8981 ",
                   {
                     "Ref":"WorkerRepo"
                   },