Merge branch 'hotfix-1.2.1' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 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.2.1] - 2018-05-14
+### Changed
+ - Upgrade baseimage to openldap:1.2.1
+
 ## [1.2.0] - 2018-03-05
 ### Changed
  - Upgrade baseimage to openldap:1.2.0
@@ -87,6 +91,7 @@ and this project follows [osixia/openldap](https://github.com/osixia/docker-open
 ## 0.1.0 - 2015-07-24
 Initial release
 
+[1.2.1]: https://github.com/osixia/docker-openldap-backup/compare/v1.2.0...v1.2.1
 [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

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap-backup
-VERSION = 1.2.0
+VERSION = 1.2.1
 
 .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.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap-backup/) 
+Latest release: 1.2.1 - [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.2.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.do
 - [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.2.0 image](#extend-osixiaopenldap-backup120-image)
+- [Extend osixia/openldap-backup:1.2.1 image](#extend-osixiaopenldap-backup121-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.2.0
+  --detach osixia/openldap-backup:1.2.1
 
 
 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.2.0 --loglevel debug
+docker run --detach osixia/openldap-backup:1.2.1 --loglevel debug
 
 See all command line options:
 
-docker run osixia/openldap-backup:1.2.0 --help
+docker run osixia/openldap-backup:1.2.1 --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.2.0
+ --detach osixia/openldap-backup:1.2.1
 
 
 #### 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.2.0
+--detach osixia/openldap-backup:1.2.1
 
 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.2.0 image
+### Extend osixia/openldap-backup:1.2.1 image
 
 If you need to add your custom environment files you can extends this image.
 
 Dockerfile example:
 
-FROM osixia/openldap-backup:1.2.0
+FROM osixia/openldap-backup:1.2.1
 MAINTAINER Your Name <your@name.com>
 
 ADD environment /container/environment/01-custom

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.2.0
+FROM osixia/openldap:1.2.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Install cron from baseimage and remove .cfss and slapd services inherited from openldap image