Skip to content

Commit ca6fa45

Browse files
committed
v1.1.3
1 parent 34060b8 commit ca6fa45

File tree

6 files changed

+33
-27
lines changed

6 files changed

+33
-27
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Changelog
22

3+
## 1.1.3
4+
Merge pull request :
5+
- Use mdb over hdb #50
6+
- Ignore lost+found directories #53
7+
- Remove Volume command from Dockerfile #56
8+
9+
Update to light-baseimage:0.2.4
10+
311
## 1.1.2
412
Merge pull request :
513
- Honor LDAP_LOG_LEVEL on startup #39
6-
14+
715
Fix :
816
- slapd tcp bind is network not interface, and so does not respond on overlay networks #35
917
- specify base_dn without domain #37

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/openldap
2-
VERSION = 1.1.2
2+
VERSION = 1.1.3
33

44
.PHONY: all build build-nocache test tag_latest release
55

README.md

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
[![Docker Pulls](https://img.shields.io/docker/pulls/osixia/openldap.svg)][hub]
44
[![Docker Stars](https://img.shields.io/docker/stars/osixia/openldap.svg)][hub]
5-
[![Image Size](https://img.shields.io/imagelayers/image-size/osixia/openldap/latest.svg)](https://imagelayers.io/?images=osixia/openldap:latest)
6-
[![Image Layers](https://img.shields.io/imagelayers/layers/osixia/openldap/latest.svg)](https://imagelayers.io/?images=osixia/openldap:latest)
75

86
[hub]: https://hub.docker.com/r/osixia/openldap/
97

10-
Latest release: 1.1.2 - OpenLDAP 2.4.40 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/) 
8+
Latest release: 1.1.3 - OpenLDAP 2.4.40 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/) 
119

1210
A docker image to run OpenLDAP.
1311

@@ -37,7 +35,7 @@ A docker image to run OpenLDAP.
3735
- [Link environment file](#link-environment-file)
3836
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
3937
- [Advanced User Guide](#advanced-user-guide)
40-
- [Extend osixia/openldap:1.1.2 image](#extend-osixiaopenldap112-image)
38+
- [Extend osixia/openldap:1.1.3 image](#extend-osixiaopenldap113-image)
4139
- [Make your own openldap image](#make-your-own-openldap-image)
4240
- [Tests](#tests)
4341
- [Kubernetes](#kubernetes)
@@ -55,7 +53,7 @@ If you find this image useful here's how you can help:
5553
## Quick Start
5654
Run OpenLDAP docker image:
5755

58-
docker run --name my-openldap-container --detach osixia/openldap:1.1.2
56+
docker run --name my-openldap-container --detach osixia/openldap:1.1.3
5957

6058
This start a new container with OpenLDAP running inside. Let's make the first search in our LDAP container:
6159

@@ -91,7 +89,7 @@ It will create an empty ldap for the company **Example Inc.** and the domain **e
9189
By default the admin has the password **admin**. All those default settings can be changed at the docker command line, for example:
9290

9391
docker run --env LDAP_ORGANISATION="My Company" --env LDAP_DOMAIN="my-company.com" \
94-
--env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.2
92+
--env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.3
9593

9694
#### Data persistence
9795

@@ -116,7 +114,7 @@ simply mount this directories as a volume to `/var/lib/ldap` and `/etc/ldap/slap
116114

117115
docker run --volume /data/slapd/database:/var/lib/ldap \
118116
--volume /data/slapd/config:/etc/ldap/slapd.d
119-
--detach osixia/openldap:1.1.2
117+
--detach osixia/openldap:1.1.3
120118

121119
You can also use data volume containers. Please refer to:
122120
> [https://docs.docker.com/userguide/dockervolumes/](https://docs.docker.com/userguide/dockervolumes/)
@@ -134,7 +132,7 @@ If you are looking for a simple solution to administrate your ldap server you ca
134132
#### Use auto-generated certificate
135133
By default TLS is enable, a certificate is created with the container hostname (it can be set by docker run --hostname option eg: ldap.example.org).
136134

137-
docker run --hostname ldap.my-company.com --detach osixia/openldap:1.1.2
135+
docker run --hostname ldap.my-company.com --detach osixia/openldap:1.1.3
138136

139137
#### Use your own certificate
140138

@@ -144,24 +142,24 @@ You can set your custom certificate at run time, by mounting a directory contain
144142
--env LDAP_TLS_CRT_FILENAME=my-ldap.crt \
145143
--env LDAP_TLS_KEY_FILENAME=my-ldap.key \
146144
--env LDAP_TLS_CA_CRT_FILENAME=the-ca.crt \
147-
--detach osixia/openldap:1.1.2
145+
--detach osixia/openldap:1.1.3
148146

149147
Other solutions are available please refer to the [Advanced User Guide](#advanced-user-guide)
150148

151149
#### Disable TLS
152150
Add --env LDAP_TLS=false to the run command:
153151

154-
docker run --env LDAP_TLS=false --detach osixia/openldap:1.1.2
152+
docker run --env LDAP_TLS=false --detach osixia/openldap:1.1.3
155153

156154
### Multi master replication
157155
Quick example, with the default config.
158156

159157
#Create the first ldap server, save the container id in LDAP_CID and get its IP:
160-
LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.2)
158+
LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.3)
161159
LDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP_CID)
162160

163161
#Create the second ldap server, save the container id in LDAP2_CID and get its IP:
164-
LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.2)
162+
LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.3)
165163
LDAP2_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP2_CID)
166164

167165
#Add the pair "ip hostname" to /etc/hosts on each containers,
@@ -197,7 +195,7 @@ You may have some problems with mounted files on some systems. The startup scrip
197195

198196
To fix that run the container with `--copy-service` argument :
199197

200-
docker run [your options] osixia/openldap:1.1.2 --copy-service
198+
docker run [your options] osixia/openldap:1.1.3 --copy-service
201199

202200
### Debug
203201

@@ -206,11 +204,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
206204

207205
Example command to run the container in `debug` mode:
208206

209-
docker run --detach osixia/openldap:1.1.2 --loglevel debug
207+
docker run --detach osixia/openldap:1.1.3 --loglevel debug
210208

211209
See all command line options:
212210

213-
docker run osixia/openldap:1.1.2 --help
211+
docker run osixia/openldap:1.1.3 --help
214212

215213

216214
## Environment Variables
@@ -269,7 +267,7 @@ Replication options:
269267

270268
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
271269

272-
docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.1.2
270+
docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.1.3
273271

274272
To convert yaml to python online: http://yaml-online-parser.appspot.com/
275273

@@ -284,7 +282,7 @@ Other environment variables:
284282
Environment variables can be set by adding the --env argument in the command line, for example:
285283

286284
docker run --env LDAP_ORGANISATION="My company" --env LDAP_DOMAIN="my-company.com" \
287-
--env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.2
285+
--env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.3
288286

289287
Be aware that environment variable added in command line will be available at any time
290288
in the container. In this example if someone manage to open a terminal in this container
@@ -295,28 +293,28 @@ he will be able to read the admin password in clear text from environment variab
295293
For example if your environment files **my-env.yaml** and **my-env.yaml.startup** are in /data/ldap/environment
296294

297295
docker run --volume /data/ldap/environment:/container/environment/01-custom \
298-
--detach osixia/openldap:1.1.2
296+
--detach osixia/openldap:1.1.3
299297

300298
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).
301299

302300
Note: the container will try to delete the **\*.yaml.startup** 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 **\*.yaml.startup**:
303301

304302
docker run --volume /data/ldap/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
305-
--detach osixia/openldap:1.1.2
303+
--detach osixia/openldap:1.1.3
306304

307305
#### Make your own image or extend this image
308306

309307
This is the best solution if you have a private registry. Please refer to the [Advanced User Guide](#advanced-user-guide) just below.
310308

311309
## Advanced User Guide
312310

313-
### Extend osixia/openldap:1.1.2 image
311+
### Extend osixia/openldap:1.1.3 image
314312

315313
If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image.
316314

317315
Dockerfile example:
318316

319-
FROM osixia/openldap:1.1.2
317+
FROM osixia/openldap:1.1.3
320318
MAINTAINER Your Name <[email protected]>
321319

322320
ADD bootstrap /container/service/slapd/assets/config/bootstrap
@@ -335,7 +333,7 @@ Clone this project:
335333
Adapt Makefile, set your image NAME and VERSION, for example:
336334

337335
NAME = osixia/openldap
338-
VERSION = 1.1.2
336+
VERSION = 1.1.3
339337

340338
become:
341339
NAME = cool-guy/openldap

example/extend-osixia-openldap/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM osixia/openldap:1.1.2
1+
FROM osixia/openldap:1.1.3
22
MAINTAINER Your Name <[email protected]>
33

44
ADD bootstrap /container/service/slapd/assets/config/bootstrap

example/kubernetes/simple/ldap-rc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: ldap
18-
image: osixia/openldap:1.1.2
18+
image: osixia/openldap:1.1.3
1919
volumeMounts:
2020
- name: ldap-data
2121
mountPath: /var/lib/ldap

example/kubernetes/using-secrets/ldap-rc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
spec:
1616
containers:
1717
- name: ldap
18-
image: osixia/openldap:1.1.2
18+
image: osixia/openldap:1.1.3
1919
command:
2020
- --copy-service
2121
volumeMounts:

0 commit comments

Comments
 (0)