Merge branch 'release/v0.3.0'

andreaskoch · Mar 11, 2017 · c8131f6 · c8131f6
2 parents bf4a066 + 05ab966
commit c8131f6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v0.3.0] - 2017-03-11
+
+Timeouts and restart policy
+
+### Added
+- Add a startup timeout (see: dcsg#4)
+- Add restart-policy (see: dcsg#4)
+
 ## [v0.2.0]
 
 systemd service improvements (thanks to @hermsi1337)

diff --git a/README.md b/README.md
@@ -63,13 +63,13 @@ For the `uninstall` action **dcsg** remove the systemd service it created earlie
 
 You can download pre-built binaries for Linux (64bit, ARM 5, ARM 6 and ARM 7) from [github.com » andreaskoch » dcsg » releases](/releases/latest):
 
-- [Download for dcsg (Linux 64bit)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_amd64)
-- [Download for dcsg (Linux ARM5)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_arm5)
-- [Download for dcsg (Linux ARM6)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_arm6)
-- [Download for dcsg (Linux ARM7)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_arm7)
+- [Download for dcsg (Linux 64bit)](https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_amd64)
+- [Download for dcsg (Linux ARM5)](https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_arm5)
+- [Download for dcsg (Linux ARM6)](https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_arm6)
+- [Download for dcsg (Linux ARM7)](https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_arm7)
 
 ```bash
-curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_amd64 > /usr/local/bin/dcsg
+curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_amd64 > /usr/local/bin/dcsg
 chmod +x /usr/local/bin/dcsg
 ```
 

diff --git a/installer.go b/installer.go
@@ -77,6 +77,9 @@ Description={{ .ProjectName }} Service
 After=network.target
 
 [Service]
+Restart=always
+RestartSec=10
+TimeoutSec=300
 WorkingDirectory={{ .ProjectDirectory }}
 ExecStartPre=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerComposeFile }}" pull
 ExecStart=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerComposeFile }}" up