Merge branch 'hotfix-1.1.11' into stable

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.1.11
+  - Upgrade baseimage: openldap:1.1.11
+
 ## 1.1.10
   - Upgrade baseimage: openldap:1.1.10
 

Makefile

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

README.md

@@ -6,10 +6,11 @@
 
 [hub]: https://hub.docker.com/r/osixia/openldap-backup/
 
-Latest release: 1.1.10 -  [Changelog](CHANGELOG.md) | [Docker 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/) 
 
 **A docker image to run OpenLDAP, and make periodic backups.**
 
+- [Contributing](#contributing)
 - [Quick start](#quick-start)
   - [Backup directory and data persistence](#backup-directory-and-data-persistence)
   - [Debug](#debug)
@@ -19,13 +20,22 @@ Latest release: 1.1.10 -  [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.10 image](#extend-osixiaopenldap-backup1110-image)
+	- [Extend osixia/openldap-backup:1.1.11 image](#extend-osixiaopenldap-backup1111-image)
 	- [Make your own phpLDAPadmin image](#make-your-own-phpldapadmin-image)
 	- [Tests](#tests)
 	- [Kubernetes](#kubernetes)
 	- [Under the hood: osixia/openldap](#under-the-hood-osixiaopenldap)
+- [Security](#security)
 - [Changelog](#changelog)
 
+## Contributing
+
+If you find this image useful here's how you can help:
+
+- Send a pull request with your kickass new features and bug fixes
+- Help new users with [issues](https://github.com/osixia/docker-openldap-backup/issues) they may encounter
+- Support the development of this image and star this repo !
+
 ## Quick start
 
 This image is based on osixia/openldap please refer to:
@@ -39,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.10
+      --detach osixia/openldap-backup:1.1.11
 
 
 For more information about docker data volume, please refer to :
@@ -53,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.10 --loglevel debug
+	docker run --detach osixia/openldap-backup:1.1.11 --loglevel debug
 
 See all command line options:
 
-	docker run osixia/openldap-backup:1.1.10 --help
+	docker run osixia/openldap-backup:1.1.11 --help
 
 
 ## Environment Variables
@@ -79,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.10
+    --detach osixia/openldap-backup:1.1.11
 
 
 #### 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.10
+	--detach osixia/openldap-backup:1.1.11
 
 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).
 
@@ -97,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.10 image
+### Extend osixia/openldap-backup:1.1.11 image
 
 If you need to add your custom environment files you can extends this image.
 
 Dockerfile example:
 
-	FROM osixia/openldap-backup:1.1.10
+	FROM osixia/openldap-backup:1.1.11
 	MAINTAINER Your Name <[email protected]>
 
 	ADD environment /container/environment/01-custom
@@ -160,6 +170,11 @@ osixia-openldap-backup kubernetes examples are available in [osixia/docker-openl
 This image is based on osixia/openldap.
 More info: https://github.com/osixia/docker-openldap
 
+## Security
+If you discover a security vulnerability within this docker image, please send an email to the Osixia! team at [email protected]. For minor vulnerabilities feel free to add an issue here on github.
+
+Please include as many details as possible.
+
 ## Changelog
 
 Please refer to: [CHANGELOG.md](CHANGELOG.md)

image/Dockerfile

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