diff --git a/CHANGELOG.md b/CHANGELOG.md index f4d02e7..8ec1f69 100644 --- a/CHANGELOG.md +++ b/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.4] - 2019-03-14 +### Changed + - Upgrade baseimage to openldap:1.2.4 + ## [1.2.3] - 2019-01-21 ### Added - Option to upload backups to S3 #7 @@ -102,6 +106,7 @@ and this project follows [osixia/openldap](https://github.com/osixia/docker-open ## 0.1.0 - 2015-07-24 Initial release +[1.2.4]: https://github.com/osixia/docker-openldap-backup/compare/v1.2.3...v1.2.4 [1.2.3]: https://github.com/osixia/docker-openldap-backup/compare/v1.2.2...v1.2.3 [1.2.2]: https://github.com/osixia/docker-openldap-backup/compare/v1.2.1...v1.2.2 [1.2.1]: https://github.com/osixia/docker-openldap-backup/compare/v1.2.0...v1.2.1 diff --git a/Makefile b/Makefile index ff4d9d4..f8fc263 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/openldap-backup -VERSION = 1.2.3 +VERSION = 1.2.4 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version diff --git a/README.md b/README.md index 9e93fe5..947eedb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [hub]: https://hub.docker.com/r/osixia/openldap-backup/ -Latest release: 1.2.3 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap-backup/)  +Latest release: 1.2.4 - [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.3 - [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.3 image](#extend-osixiaopenldap-backup123-image) + - [Extend osixia/openldap-backup:1.2.4 image](#extend-osixiaopenldap-backup124-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.3 + --detach osixia/openldap-backup:1.2.4 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.3 --loglevel debug + docker run --detach osixia/openldap-backup:1.2.4 --loglevel debug See all command line options: - docker run osixia/openldap-backup:1.2.3 --help + docker run osixia/openldap-backup:1.2.4 --help ## Environment Variables @@ -89,7 +89,7 @@ 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.3 + --detach osixia/openldap-backup:1.2.4 #### Link environment file @@ -97,7 +97,7 @@ Environment variables can be set by adding the --env argument in the command lin 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.3 + --detach osixia/openldap-backup:1.2.4 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.3 image +### Extend osixia/openldap-backup:1.2.4 image If you need to add your custom environment files you can extends this image. Dockerfile example: - FROM osixia/openldap-backup:1.2.3 + FROM osixia/openldap-backup:1.2.4 MAINTAINER Your Name ADD environment /container/environment/01-custom diff --git a/image/Dockerfile b/image/Dockerfile index 60695c9..d3cca43 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM osixia/openldap:1.2.3 +FROM osixia/openldap:1.2.4 # Install cron from baseimage and remove .cfss and slapd services inherited from openldap image # remove also previous default environment files, they are not needed.