Merge branch 'release-1.2.0' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,60 +1,107 @@
 # Changelog
+All notable changes to this project will be documented in this file.
 
-## 1.1.11
-  - Upgrade baseimage: openldap:1.1.11
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project follows [osixia/openldap](https://github.com/osixia/docker-openldap-backup) versioning.
 
-## 1.1.10
-  - Upgrade baseimage: openldap:1.1.10
+## [1.2.0] - 2018-03-05
+### Changed
+  - Upgrade baseimage to openldap:1.2.0
 
-## 1.1.9
-  - Upgrade baseimage: openldap:1.1.9
+## [1.1.11] - 2017-12-21
+### Changed
+  - Upgrade baseimage to openldap:1.1.11
 
-## 1.1.8
-  - Upgrade baseimage: openldap:1.1.8
+## [1.1.10] - 2017-12-12
+### Changed
+  - Upgrade baseimage to openldap:1.1.10
 
-## 1.1.7
-  - Upgrade baseimage: openldap:1.1.7
-  - chmod 600 o backups
+## [1.1.9] - 2017-07-19
+### Changed
+  - Upgrade baseimage to openldap:1.1.9
 
-## 1.1.6
+## [1.1.8] - 2017-02-16
+### Changed
+  - Upgrade baseimage to openldap:1.1.8
+
+## [1.1.7] - 2016-11-09
+### Changed
+  - Upgrade baseimage to openldap:1.1.7
+  - chmod 600 on backups
+
+## [1.1.6] - 2016-09-02
+### Changed
   - Now a mutliple process image based on osixia/openldap with slapd
   - Restore tools updated
-  - Use same release number as osixia/openldap
 
-## 0.1.10
-  - Upgrade baseimage: openldap:1.1.6
+## Versions before following the osixia/openldap versioning
 
-## 0.1.10
-  - Upgrade baseimage: openldap:1.1.5
+## [0.1.11] - 2016-09-02
+### Changed
+  - Upgrade baseimage to openldap:1.1.6
 
-## 0.1.9
-  - Upgrade baseimage: openldap:1.1.4
+## [0.1.10] - 2016-08-02
+### Changed
+  - Upgrade baseimage to openldap:1.1.5
 
-## 0.1.8
-  - Upgrade baseimage: openldap:1.1.1
+## [0.1.9] - 2016-07-26
+### Changed
+  - Upgrade baseimage to openldap:1.1.4
 
-## 0.1.7
-  - Upgrade baseimage: openldap:1.1.0
+## [0.1.8] - 2016-02-20
+### Changed
+  - Upgrade baseimage to openldap:1.1.1
+
+## [0.1.7] - 2016-01-25
+### Added
   - Makefile with build no cache
 
-## 0.1.6
-  - Upgrade baseimage: openldap:1.0.7
+### Changed
+  - Upgrade baseimage to openldap:1.1.0  
+
+## [0.1.6] - 2015-11-20
+### Changed
+  - Upgrade baseimage to openldap:1.0.7
 
-## 0.1.5
-  - Upgrade baseimage: openldap:1.0.6
+## [0.1.5] - 2015-11-20
+### Changed
+  - Upgrade baseimage to openldap:1.0.6
 
-## 0.1.4
-  - Upgrade baseimage: openldap:1.0.5
+## [0.1.4] - 2015-11-19
+### Changed
+  - Upgrade baseimage to openldap:1.0.5
 
-## 0.1.3
-  - Upgrade baseimage: openldap:1.0.4
+## [0.1.3] - 2015-11-06
+### Changed
+  - Upgrade baseimage to openldap:1.0.4
 
-## 0.1.2
-  - Upgrade baseimage: openldap:1.0.3
+## [0.1.2] - 2015-10-26
+### Changed
+  - Upgrade baseimage to openldap:1.0.3
 
-## 0.1.1
-  - Upgrade baseimage: openldap:1.0.1
+## [0.1.1] - 2015-08-18
+### Changed
+  - Upgrade baseimage to openldap:1.0.1
   - Rename environment variables
 
-## 0.1.0
-  - Initial release
+## 0.1.0 - 2015-07-24
+Initial release
+
+[1.2.0]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.11...v1.2.0
+[1.1.11]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.10...v1.1.11
+[1.1.10]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.9...v1.1.10
+[1.1.9]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.8...v1.1.9
+[1.1.8]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.7...v1.1.8
+[1.1.7]: https://github.com/osixia/docker-openldap-backup/compare/v1.1.6...v1.1.7
+[1.1.6]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.11...v1.1.6
+[0.1.11]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.10...v0.1.11
+[0.1.10]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.9...v0.1.10
+[0.1.9]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.8...v0.1.9
+[0.1.8]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.7...v0.1.8
+[0.1.7]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.6...v0.1.7
+[0.1.6]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.5...v0.1.6
+[0.1.5]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.2...v0.1.3
+[0.1.2]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.1...v0.1.2
+[0.1.1]: https://github.com/osixia/docker-openldap-backup/compare/v0.1.0...v0.1.1

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 1.1.11
+VERSION = 1.2.0
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 

README.md

@@ -6,7 +6,7 @@
 
 [hub]: https://hub.docker.com/r/osixia/openldap-backup/
 
-Latest release: 1.1.11 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap-backup/) 
+Latest release: 1.2.0 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap-backup/) 
 
 **A docker image to run OpenLDAP, and make periodic backups.**
 
@@ -20,7 +20,7 @@ Latest release: 1.1.11 -  [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.d
 		- [Link environment file](#link-environment-file)
 		- [Make your own image or extend this image](#make-your-own image-or-extend-this-image)
 - [Advanced User Guide](#advanced-user-guide)
-	- [Extend osixia/openldap-backup:1.1.11 image](#extend-osixiaopenldap-backup1111-image)
+	- [Extend osixia/openldap-backup:1.2.0 image](#extend-osixiaopenldap-backup120-image)
 	- [Make your own phpLDAPadmin image](#make-your-own-phpldapadmin-image)
 	- [Tests](#tests)
 	- [Kubernetes](#kubernetes)
@@ -49,7 +49,7 @@ Backups are created in the directory `/data/backup` that should be mapped has vo
 
       docker run --env LDAP_BACKUP_CONFIG_CRON_EXP="0 5 * * *" \
       --volume /data/openldap/backup:/data/backup \
-      --detach osixia/openldap-backup:1.1.11
+      --detach osixia/openldap-backup:1.2.0
 
 
 For more information about docker data volume, please refer to :
@@ -63,11 +63,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
 
 Example command to run the container in `debug` mode:
 
-	docker run --detach osixia/openldap-backup:1.1.11 --loglevel debug
+	docker run --detach osixia/openldap-backup:1.2.0 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/openldap-backup:1.1.11 --help
+	docker run osixia/openldap-backup:1.2.0 --help
 
 
 ## Environment Variables
@@ -89,15 +89,15 @@ See how to [set your own environment variables](#set-your-own-environment-variab
 Environment variables can be set by adding the --env argument in the command line, for example:
 
     docker run --env LDAP_BACKUP_CONFIG_CRON_EXP="0 5 * * *" \
-    --detach osixia/openldap-backup:1.1.11
+    --detach osixia/openldap-backup:1.2.0
 
 
 #### Link environment file
 
 For example if your environment file is in :  /data/ldap/environment/my-env.yaml
 
 	docker run --volume /data/ldap/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
-	--detach osixia/openldap-backup:1.1.11
+	--detach osixia/openldap-backup:1.2.0
 
 Take care to link your environment file to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not  directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE).
 
@@ -107,13 +107,13 @@ This is the best solution if you have a private registry. Please refer to the [A
 
 ## Advanced User Guide
 
-### Extend osixia/openldap-backup:1.1.11 image
+### Extend osixia/openldap-backup:1.2.0 image
 
 If you need to add your custom environment files you can extends this image.
 
 Dockerfile example:
 
-	FROM osixia/openldap-backup:1.1.11
+	FROM osixia/openldap-backup:1.2.0
 	MAINTAINER Your Name <[email protected]>
 
 	ADD environment /container/environment/01-custom

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.1.11
+FROM osixia/openldap:1.2.0
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # Install cron from baseimage and remove .cfss and slapd services inherited from openldap image