v1.4.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1047dfb..b9c051c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,35 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## [1.4.0] - 2020-06-15
+30M+ docker pulls 🎉🎉🎉 thanks to all contributors 💕
+### Added
+ - Allow setting ports on ldap and ldaps #403. Thanks to @chirauki !
+ - Address firewall issues on RHEL in README #394. Thanks to @BirkhoffLee !
+ - Ensure ca certs are up to date #387. Thanks to @Jyrno42 !
+ - Install slapd-contrib to include pbkdf2 pw support #365. Thanks to @col-panic !
+ - Seeding from internal path. #361. Thanks to @dbck !
+ - Enable openldap uid/gid to be specified at runtime #336. Thanks to @lj020326 !
+
+### Changes
+ - Update openldap 2.4.48 to 2.4.50
+ - LDAP_TLS_PROTOCOL_MIN is deprecated #432. Thanks to @mettacrawler !
+ - Better handling of environment variables checks #382. Thanks to @obourdon !
+
+### Fixed
+ - Multi-node replication fixes #420. Thanks to @pcolmer !
+ - Grant root manage access to database #416. Thanks to @olia-dev !
+
## [1.3.0] - 2019-09-29
-## Added
+### Added
- Multiarch support
-## Changes
+### Changes
- Update openldap 2.4.47 to 2.4.48 #247
- Upgrade baseimage to light-baseimage:1.2.0 (debian buster)
## [1.2.5] - 2019-08-16
-## Added
+### Added
- Support for docker secrets #325. Thanks to @anagno !
- Add DISABLE_CHOWN environment variable #240
- pqChecker lib to check passwords strength with ppolicy pwdCheckModule
@@ -252,6 +271,7 @@
## [0.10.0] - 2015-03-03
New version initial release, no changelog before this sorry.
+[1.4.0]: https://github.com/osixia/docker-openldap/compare/v1.3.0...v1.4.0
[1.3.0]: https://github.com/osixia/docker-openldap/compare/v1.2.5...v1.3.0
[1.2.5]: https://github.com/osixia/docker-openldap/compare/v1.2.4...v1.2.5
[1.2.4]: https://github.com/osixia/docker-openldap/compare/v1.2.3...v1.2.4
diff --git a/Makefile b/Makefile
index e1c79f7..207e835 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
NAME = osixia/openldap
-VERSION = 1.3.0
+VERSION = 1.4.0
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
diff --git a/README.md b/README.md
index 78837f3..d241b8f 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-Latest release: 1.3.0 - OpenLDAP 2.4.48 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/)
+Latest release: 1.4.0 - OpenLDAP 2.4.50 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/)
**A docker image to run OpenLDAP.**
@@ -39,7 +39,7 @@
- [Docker Secrets](#docker-secrets)
- [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:1.3.0 image](#extend-osixiaopenldap130-image)
+ - [Extend osixia/openldap:1.4.0 image](#extend-osixiaopenldap140-image)
- [Make your own openldap image](#make-your-own-openldap-image)
- [Tests](#tests)
- [Kubernetes](#kubernetes)
@@ -59,11 +59,11 @@
## Quick Start
Run OpenLDAP docker image:
- docker run --name my-openldap-container --detach osixia/openldap:1.3.0
+ docker run --name my-openldap-container --detach osixia/openldap:1.4.0
Do not forget to add the port mapping for both port 389 and 636 if you wish to access the ldap server from another machine.
- docker run -p 389:389 -p 636:636 --name my-openldap-container --detach osixia/openldap:1.3.0
+ docker run -p 389:389 -p 636:636 --name my-openldap-container --detach osixia/openldap:1.4.0
Either command starts a new container with OpenLDAP running inside. Let's make the first search in our LDAP container:
@@ -99,7 +99,7 @@
By default the admin has the password **admin**. All those default settings can be changed at the docker command line, for example:
docker run --env LDAP_ORGANISATION="My Company" --env LDAP_DOMAIN="my-company.com" \
- --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.3.0
+ --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.4.0
#### Data persistence
@@ -158,12 +158,12 @@
# single file example:
docker run \
--volume ./bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/50-bootstrap.ldif \
- osixia/openldap:1.3.0 --copy-service
+ osixia/openldap:1.4.0 --copy-service
#directory example:
docker run \
--volume ./ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom \
- osixia/openldap:1.3.0 --copy-service
+ osixia/openldap:1.4.0 --copy-service
#### Seed from internal path
@@ -192,7 +192,7 @@
docker run --volume /data/slapd/database:/var/lib/ldap \
--volume /data/slapd/config:/etc/ldap/slapd.d \
- --detach osixia/openldap:1.3.0
+ --detach osixia/openldap:1.4.0
You can also use data volume containers. Please refer to:
> [https://docs.docker.com/engine/tutorials/dockervolumes/](https://docs.docker.com/engine/tutorials/dockervolumes/)
@@ -212,7 +212,7 @@
#### Use auto-generated certificate
By default, TLS is already configured and enabled, certificate is created using container hostname (it can be set by docker run --hostname option eg: ldap.example.org).
- docker run --hostname ldap.my-company.com --detach osixia/openldap:1.3.0
+ docker run --hostname ldap.my-company.com --detach osixia/openldap:1.4.0
#### Use your own certificate
@@ -222,24 +222,24 @@
--env LDAP_TLS_CRT_FILENAME=my-ldap.crt \
--env LDAP_TLS_KEY_FILENAME=my-ldap.key \
--env LDAP_TLS_CA_CRT_FILENAME=the-ca.crt \
- --detach osixia/openldap:1.3.0
+ --detach osixia/openldap:1.4.0
Other solutions are available please refer to the [Advanced User Guide](#advanced-user-guide)
#### Disable TLS
Add --env LDAP_TLS=false to the run command:
- docker run --env LDAP_TLS=false --detach osixia/openldap:1.3.0
+ docker run --env LDAP_TLS=false --detach osixia/openldap:1.4.0
### Multi master replication
Quick example, with the default config.
#Create the first ldap server, save the container id in LDAP_CID and get its IP:
- LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.3.0)
+ LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.4.0)
LDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP_CID)
#Create the second ldap server, save the container id in LDAP2_CID and get its IP:
- LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.3.0)
+ LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.4.0)
LDAP2_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP2_CID)
#Add the pair "ip hostname" to /etc/hosts on each containers,
@@ -275,7 +275,7 @@
To fix that run the container with `--copy-service` argument :
- docker run [your options] osixia/openldap:1.3.0 --copy-service
+ docker run [your options] osixia/openldap:1.4.0 --copy-service
### Debug
@@ -284,11 +284,11 @@
Example command to run the container in `debug` mode:
- docker run --detach osixia/openldap:1.3.0 --loglevel debug
+ docker run --detach osixia/openldap:1.4.0 --loglevel debug
See all command line options:
- docker run osixia/openldap:1.3.0 --help
+ docker run osixia/openldap:1.4.0 --help
## Environment Variables
@@ -354,7 +354,7 @@
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
- docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.3.0
+ docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.4.0
To convert yaml to python online: http://yaml-online-parser.appspot.com/
@@ -377,7 +377,7 @@
Environment variables can be set by adding the --env argument in the command line, for example:
docker run --env LDAP_ORGANISATION="My company" --env LDAP_DOMAIN="my-company.com" \
- --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.3.0
+ --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.4.0
Be aware that environment variable added in command line will be available at any time
in the container. In this example if someone manage to open a terminal in this container
@@ -388,14 +388,14 @@
For example if your environment files **my-env.yaml** and **my-env.startup.yaml** are in /data/ldap/environment
docker run --volume /data/ldap/environment:/container/environment/01-custom \
- --detach osixia/openldap:1.3.0
+ --detach osixia/openldap:1.4.0
Take care to link your environment files folder 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).
Note: the container will try to delete the **\*.startup.yaml** file after the end of startup files so the file will also be deleted on the docker host. To prevent that : use --volume /data/ldap/environment:/container/environment/01-custom**:ro** or set all variables in **\*.yaml** file and don't use **\*.startup.yaml**:
docker run --volume /data/ldap/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
- --detach osixia/openldap:1.3.0
+ --detach osixia/openldap:1.4.0
#### Docker Secrets
@@ -414,13 +414,13 @@
## Advanced User Guide
-### Extend osixia/openldap:1.3.0 image
+### Extend osixia/openldap:1.4.0 image
If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image.
Dockerfile example:
- FROM osixia/openldap:1.3.0
+ FROM osixia/openldap:1.4.0
MAINTAINER Your Name <your@name.com>
ADD bootstrap /container/service/slapd/assets/config/bootstrap
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index cde8795..e6b0a8b 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -1,7 +1,7 @@
version: '2'
services:
openldap:
- image: osixia/openldap:1.3.0
+ image: osixia/openldap:1.4.0
container_name: openldap
environment:
LDAP_LOG_LEVEL: "256"
diff --git a/example/extend-osixia-openldap/Dockerfile b/example/extend-osixia-openldap/Dockerfile
index 19bce2c..e4371cc 100644
--- a/example/extend-osixia-openldap/Dockerfile
+++ b/example/extend-osixia-openldap/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/openldap:1.3.0
+FROM osixia/openldap:1.4.0
MAINTAINER Your Name <your@name.com>
ADD bootstrap /container/service/slapd/assets/config/bootstrap
diff --git a/example/kubernetes/simple/ldap-deployment.yaml b/example/kubernetes/simple/ldap-deployment.yaml
index 9f33dfe..8c4daa9 100644
--- a/example/kubernetes/simple/ldap-deployment.yaml
+++ b/example/kubernetes/simple/ldap-deployment.yaml
@@ -13,7 +13,7 @@
spec:
containers:
- name: ldap
- image: osixia/openldap:1.3.0
+ image: osixia/openldap:1.4.0
volumeMounts:
- name: ldap-data
mountPath: /var/lib/ldap
diff --git a/example/kubernetes/using-secrets/gce-statefullset.yaml b/example/kubernetes/using-secrets/gce-statefullset.yaml
index e280b13..41cbab3 100644
--- a/example/kubernetes/using-secrets/gce-statefullset.yaml
+++ b/example/kubernetes/using-secrets/gce-statefullset.yaml
@@ -12,7 +12,7 @@
spec:
containers:
- name: azaldap
- image: osixia/openldap:1.3.0
+ image: osixia/openldap:1.4.0
imagePullPolicy: IfNotPresent
#command: ["/bin/bash","-c","while [ 1 = 1 ] ; do sleep 1; date; done"]
ports:
diff --git a/example/kubernetes/using-secrets/ldap-deployment.yaml b/example/kubernetes/using-secrets/ldap-deployment.yaml
index 9d96c26..c56baae 100644
--- a/example/kubernetes/using-secrets/ldap-deployment.yaml
+++ b/example/kubernetes/using-secrets/ldap-deployment.yaml
@@ -13,7 +13,7 @@
spec:
containers:
- name: ldap
- image: osixia/openldap:1.3.0
+ image: osixia/openldap:1.4.0
args: ["--copy-service"]
volumeMounts:
- name: ldap-data
diff --git a/image/Dockerfile b/image/Dockerfile
index 9ecd974..cfac93e 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,6 +1,6 @@
# Use osixia/light-baseimage
# sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:release-1.2.0-dev
+FROM osixia/light-baseimage:1.2.0
ARG LDAP_OPENLDAP_GID
ARG LDAP_OPENLDAP_UID
