Merge branch 'release/v0.1.1-alpha'

andreaskoch · Dec 18, 2016 · d1aaac2 · d1aaac2
2 parents 2cb8b30 + 6628f00
commit d1aaac2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ 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.1.1-alpha] - 2016-12-18
+
+Set the working directory for the systemd services
+
+### Changed
+- Set the working directory (see: https://www.freedesktop.org/software/systemd/man/systemd.exec.html) for the docker-compose systemd services. Otherwise docker-compose cannot locate `env_file`s (see: https://docs.docker.com/compose/compose-file/#/envfile)
+
 ## [v0.1.0-alpha] - 2016-12-18
 
 The prototype

diff --git a/README.md b/README.md
@@ -61,13 +61,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.0-alpha/dcsg_linux_amd64)
-- [Download for dcsg (Linux ARM5)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.0-alpha/dcsg_linux_arm5)
-- [Download for dcsg (Linux ARM6)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.0-alpha/dcsg_linux_arm6)
-- [Download for dcsg (Linux ARM7)](https://github.com/andreaskoch/dcsg/releases/download/v0.1.0-alpha/dcsg_linux_arm7)
+- [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)
 
 ```bash
-curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.1.0-alpha/dcsg_linux_amd64 > /usr/local/bin/dcsg
+curl -L https://github.com/andreaskoch/dcsg/releases/download/v0.1.1-alpha/dcsg_linux_amd64 > /usr/local/bin/dcsg
 chmod +x /usr/local/bin/dcsg
 ```
 

diff --git a/installer.go b/installer.go
@@ -77,8 +77,9 @@ Description={{ .ProjectName }} Service
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .ProjectDirectory }}/{{ .DockerComposeFile }}" up
-ExecStop=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .ProjectDirectory }}/{{ .DockerComposeFile }}" down
+WorkingDirectory={{ .ProjectDirectory }}
+ExecStart=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerComposeFile }}" up
+ExecStop=/usr/bin/env docker-compose -p "{{ .ProjectName }}" -f "{{ .DockerComposeFile }}" down
 
 [Install]
 WantedBy=network-online.target

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