Merge branch 'release/v0.4.0'

andreaskoch · May 16, 2017 · 46accc9 · 46accc9
2 parents c8131f6 + 5aef2ae
commit 46accc9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 bin
+.DS_Store
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.4.0]
+
+Improved systemd reliability (thanks to @hermsi1337)
+
+### Changed
+- Change the application version to v0.3.0
+- Improve systemd-reliability (see: dcsg#6)
+
 ## [v0.3.0] - 2017-03-11
 
 Timeouts and restart policy

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.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)
+- [Download for dcsg (Linux 64bit)](https://github.com/andreaskoch/dcsg/releases/download/v0.3.0/dcsg_linux_amd64)
+- [Download for dcsg (Linux ARM5)](https://github.com/andreaskoch/dcsg/releases/download/v0.3.0/dcsg_linux_arm5)
+- [Download for dcsg (Linux ARM6)](https://github.com/andreaskoch/dcsg/releases/download/v0.3.0/dcsg_linux_arm6)
+- [Download for dcsg (Linux ARM7)](https://github.com/andreaskoch/dcsg/releases/download/v0.3.0/dcsg_linux_arm7)
 
 ```bash
-curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.2.0/dcsg_linux_amd64 > /usr/local/bin/dcsg
+curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.3.0/dcsg_linux_amd64 > /usr/local/bin/dcsg
 chmod +x /usr/local/bin/dcsg
 ```
 

diff --git a/installer.go b/installer.go
@@ -74,7 +74,8 @@ func getServiceName(projectName string) string {
 
 const serviceTemplate = `[Unit]
 Description={{ .ProjectName }} Service
-After=network.target
+After=network.service docker.service  
+Requires=docker.service
 
 [Service]
 Restart=always
@@ -87,7 +88,7 @@ ExecStop=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerCompo
 ExecStopPost=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerComposeFile }}" down
 
 [Install]
-WantedBy=network-online.target
+WantedBy=docker.service
 `
 
 type serviceDefinition struct {

diff --git a/main.go b/main.go
@@ -8,7 +8,7 @@ import (
 )
 
 const applicationName = "dcsg"
-const applicationVersion = "v0.1.1-alpha"
+const applicationVersion = "v0.4.0"
 
 var (
 	app = kingpin.New(applicationName, fmt.Sprintf("%s creates systemd services for Docker Compose projects (%s)", applicationName, applicationVersion))