Merge branch 'hotfix-0.1.2' into stable

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.2
+  - Upgrade baseimage: osixia/openldap:1.0.3
+
 ## 0.1.1
   - Upgrade baseimage: osixia/openldap:1.0.1
   - Rename environment variables

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 0.1.1
+VERSION = 0.1.2
 
 .PHONY: all build test tag_latest release
 

README.md

@@ -22,7 +22,7 @@ For more information about docker data volume, please refer to :
 
 ## Environment Variables
 
-Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/etc/env.yaml`. See examples below.
+Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/container/environment/env.yaml`. See examples below.
 
 - **LDAP_BACKUP_CONFIG_CRON_EXP**: Cron expression to schedule OpenLDAP config backup. Defaults to `"0 4 * * *"`. Every days at 4am.
 
@@ -36,9 +36,9 @@ Environment variable can be set directly by adding the -e argument in the comman
 
 	docker run -e LDAP_BACKUP_CONFIG_CRON_EXP="0 5 * * *" -d osixia/openldap-backup
 
-Or by setting your own `env.yaml` file as a docker volume to `/etc/env.yaml`
+Or by setting your own `env.yaml` file as a docker volume to `/container/environment/env.yaml`
 
-	docker run -v /data/my-env.yaml:/etc/env.yaml \
+	docker run -v /data/my-env.yaml:/container/environment/env.yaml \
 	-d osixia/openldap-backup
 
 ## Manual build

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.0.1
+FROM osixia/openldap:1.0.3
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Use baseimage's init system.
@@ -25,7 +25,7 @@ RUN /container/tool/install-service \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add default env variables
-ADD env.yaml /etc/env.yaml
+ADD env.yaml /container/environment/env.yaml
 
 # Set backup data in a data volume
 VOLUME ["/data/backup"]