Merge branch 'master' into multi-stage-build

armadaplatform · Mar 16, 2018 · 1e5fdf7 · 1e5fdf7
2 parents 868ec24 + c61eb9c
commit 1e5fdf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@
 - Base images in `armada build` may, and should now use explicit dockyard/docker registry addresses,
     e.g.: `FROM docker.io/golang:1.7.3`, or `FROM dockyard.armada.sh/microservice`.
 
+### Improvements
+- Set `TimeoutStartSec=30min` in systemd unit to prevent timeouts
+
 ### Bug fixes
 - Fix netcat version on ArchLinux
 

diff --git a/packaging/systemd/armada.service b/packaging/systemd/armada.service
@@ -4,7 +4,7 @@ After=docker.service
 Requires=docker.service
 
 [Service]
-TimeoutStartSec="infinity"
+TimeoutStartSec=30min
 Environment="CIDFILE=/var/run/armada.pid"
 ExecStartPre=/usr/local/bin/armada-runner restart
 ExecStart=/bin/bash -c "/usr/bin/docker wait $(cat ${CIDFILE})"