Skip to content

Commit 96fb8ee

Browse files
BertrandGounyBertrandGouny
committed
Merge branch 'hotfix-0.7.2' into stable
2 parents 887d2b6 + 1bdf477 commit 96fb8ee

File tree

6 files changed

+162
-91
lines changed

6 files changed

+162
-91
lines changed

‎CHANGELOG.md

Lines changed: 85 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,113 @@
11
# Changelog
2+
All notable changes to this project will be documented in this file.
23

3-
## 0.7.1
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
5+
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
6+
7+
## [0.7.2] - 2018-09-04
8+
### Added
9+
- Ability to sepcifiy different values for ldap 'host' and 'name' #46
10+
11+
## [0.7.1] - 2017-12-05
12+
### Added
13+
- Opcache config
14+
15+
### Changed
416
- Optimise apache config
5-
- Add opcache config
6-
- Upgrade baseimage: web-baseimage:1.1.1
17+
- Upgrade baseimage to web-baseimage:1.1.1
718

8-
## 0.7.0
19+
## [0.7.0] - 2017-07-19
20+
### Added
921
- add config.php in config folder
10-
- Upgrade baseimage: web-baseimage:1.1.0 (debian stretch, php7)
1122

12-
## 0.6.12
23+
### Changed
24+
- Upgrade baseimage to web-baseimage:1.1.0 (debian stretch, php7)
25+
26+
## [0.6.12] - 2017-03-27
27+
### Changed
28+
- Upgrade baseimage to web-baseimage:1.0.0
29+
30+
### Fixed
1331
- Fixes Parse error: syntax error, unexpected '}' in config.php on line 68 #23
14-
- Upgrade baseimage: web-baseimage:1.0.0
1532

16-
## 0.6.11
17-
- Upgrade baseimage: web-baseimage:0.1.10
33+
## [0.6.11] - 2016-09-02
34+
### Changed
35+
- Upgrade baseimage to web-baseimage:0.1.10
1836

19-
## 0.6.10
37+
## [0.6.10] - 2016-07-26
38+
### Added
2039
- Add PHPLDAPADMIN_SERVER_PATH environment variable
2140

22-
## 0.6.9
23-
- Upgrade baseimage: web-baseimage:0.1.10
41+
## [0.6.9] - 2016-06-09
42+
### Changed
43+
- Upgrade baseimage to web-baseimage:0.1.10
2444

25-
## 0.6.8
26-
- Upgrade baseimage: web-baseimage:0.1.9
45+
## [0.6.8] - 2016-02-20
46+
### Changed
47+
- Upgrade baseimage to web-baseimage:0.1.9
2748

28-
## 0.6.7
29-
- Upgrade baseimage: web-baseimage:0.1.8
49+
## [0.6.7] - 2016-01-25
50+
### Changed
51+
- Upgrade baseimage to web-baseimage:0.1.8
3052

31-
## 0.6.6
32-
- Upgrade baseimage: web-baseimage:0.1.7
53+
## [0.6.6] - 2015-12-16
54+
### Added
3355
- Makefile with build no cache
3456

35-
## 0.6.5
36-
- Upgrade baseimage: web-baseimage:0.1.6
57+
### Changed
58+
- Upgrade baseimage to web-baseimage:0.1.7
3759

38-
## 0.6.4
39-
- Upgrade baseimage: web-baseimage:0.1.5
40-
- Remove listen on http when https is enable
60+
## [0.6.5] - 2015-11-20
61+
### Changed
62+
- Upgrade baseimage to web-baseimage:0.1.6
63+
64+
## [0.6.4] - 2015-11-19
65+
### Changed
66+
- Upgrade baseimage to web-baseimage:0.1.5
4167
- externalise ldap-client config from phpLdapAdmin
4268

43-
## 0.6.3
44-
- Upgrade baseimage: web-baseimage:0.1.3
69+
### Removed
70+
- Remove listen on http when https is enable
71+
72+
## [0.6.3] - 2015-10-26
73+
### Changed
74+
- Upgrade baseimage to web-baseimage:0.1.3
4575

46-
## 0.6.2
76+
## [0.6.2] - 2015-08-21
77+
### Changed
4778
- Better way to add custom config
4879

49-
## 0.6.1
50-
- Upgrade baseimage: web-baseimage:0.1.1
80+
## [0.6.1] - 2015-08-20
81+
### Changed
82+
- Upgrade baseimage to web-baseimage:0.1.1
5183
- Rename environment variables
5284

53-
## 0.6.0
85+
## [0.6.0] - 2015-07-24
86+
### Changed
5487
- Use new baseimage: light-baseimage
5588

56-
## 0.5.1
89+
## [0.5.1] - 2015-05-17
90+
### Fixed
5791
- Fix #1 (can't activate SSL with own certificates)
5892

59-
## 0.5.0
60-
- New version initial release
93+
## [0.5.0] - 2015-03-03
94+
New version initial release, no changelog before this sorry.
95+
96+
[0.7.2]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.7.1...v0.7.2
97+
[0.7.1]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.7.0...v0.7.1
98+
[0.7.0]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.12...v0.7.0
99+
[0.6.12]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.11...v0.6.12
100+
[0.6.11]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.10...v0.6.11
101+
[0.6.10]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.9...v0.6.10
102+
[0.6.9]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.8...v0.6.9
103+
[0.6.8]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.7...v0.6.8
104+
[0.6.7]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.6...v0.6.7
105+
[0.6.6]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.5...v0.6.6
106+
[0.6.5]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.4...v0.6.5
107+
[0.6.4]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.3...v0.6.4
108+
[0.6.3]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.2...v0.6.3
109+
[0.6.2]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.1...v0.6.2
110+
[0.6.1]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.6.0...v0.6.1
111+
[0.6.0]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.5.1...v0.6.0
112+
[0.5.1]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.5.0...v0.5.1
113+
[0.5.0]: https://github.com/osixia/docker-phpLDAPadmin/compare/v0.1.0...v0.5.0

‎Makefile

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

44
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
55

‎README.md

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,43 @@
55

66
[hub]: https://hub.docker.com/r/osixia/phpldapadmin/
77

8-
Latest release: 0.7.1 - phpLDAPadmin 1.2.3 (with php7 patch) - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/phpldapadmin/) 
8+
Latest release: 0.7.2 - phpLDAPadmin 1.2.3 (with php7 patch) - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/phpldapadmin/) 
99

1010
**A docker image to run phpLDAPadmin.**
1111
> [phpldapadmin.sourceforge.net](http://phpldapadmin.sourceforge.net)
1212
13-
- [Quick start](#quick-start)
14-
- [OpenLDAP & phpLDAPadmin in 1'](#openldap--phpldapadmin-in-1)
15-
- [Beginner Guide](#beginner-guide)
16-
- [Use your own phpLDAPadmin config](#use-your-own-phpldapadmin-config)
17-
- [HTTPS](#https)
18-
- [Use autogenerated certificate](#use-autogenerated-certificate)
19-
- [Use your own certificate](#use-your-own-certificate)
20-
- [Disable HTTPS](#disable-https)
21-
- [Fix docker mounted file problems](#fix-docker-mounted-file-problems)
22-
- [Debug](#debug)
23-
- [Environment Variables](#environment-variables)
24-
- [Set your own environment variables](#set-your-own-environment-variables)
25-
- [Use command line argument](#use-command-line-argument)
26-
- [Link environment file](#link-environment-file)
27-
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
28-
- [Advanced User Guide](#advanced-user-guide)
29-
- [Extend osixia/phpldapadmin:0.7.1 image](#extend-osixiaphpldapadmin070-image)
30-
- [Make your own phpLDAPadmin image](#make-your-own-phpldapadmin-image)
31-
- [Tests](#tests)
32-
- [Kubernetes](#kubernetes)
33-
- [Under the hood: osixia/web-baseimage](#under-the-hood-osixiaweb-baseimage)
34-
- [Changelog](#changelog)
13+
- [osixia/phpldapadmin](#osixiaphpldapadmin)
14+
- [Quick start](#quick-start)
15+
- [OpenLDAP & phpLDAPadmin in 1'](#openldap--phpldapadmin-in-1)
16+
- [Beginner Guide](#beginner-guide)
17+
- [Use your own phpLDAPadmin config](#use-your-own-phpldapadmin-config)
18+
- [HTTPS](#https)
19+
- [Use autogenerated certificate](#use-autogenerated-certificate)
20+
- [Use your own certificate](#use-your-own-certificate)
21+
- [Disable HTTPS](#disable-https)
22+
- [Fix docker mounted file problems](#fix-docker-mounted-file-problems)
23+
- [Debug](#debug)
24+
- [Environment Variables](#environment-variables)
25+
- [Set your own environment variables](#set-your-own-environment-variables)
26+
- [Use command line argument](#use-command-line-argument)
27+
- [Link environment file](#link-environment-file)
28+
- [Make your own image or extend this image](#make-your-own-image-or-extend-this-image)
29+
- [Advanced User Guide](#advanced-user-guide)
30+
- [Extend osixia/phpldapadmin:0.7.2 image](#extend-osixiaphpldapadmin072-image)
31+
- [Make your own phpLDAPadmin image](#make-your-own-phpldapadmin-image)
32+
- [Tests](#tests)
33+
- [Kubernetes](#kubernetes)
34+
- [Under the hood: osixia/web-baseimage](#under-the-hood-osixiaweb-baseimage)
35+
- [Security](#security)
36+
- [Changelog](#changelog)
3537

3638
## Quick start
3739

3840
Run a phpLDAPadmin docker image by replacing `ldap.example.com` with your ldap host or IP :
3941

4042
docker run -p 6443:443 \
41-
--env PHPLDAPADMIN_LDAP_HOSTS=ldap.example.com \
42-
--detach osixia/phpldapadmin:0.7.1
43+
--env PHPLDAPADMIN_LDAP_HOSTS=ldap.example.com \
44+
--detach osixia/phpldapadmin:0.7.2
4345

4446
That's it :) you can access phpLDAPadmin on [https://localhost:6443](https://localhost:6443)
4547

@@ -49,7 +51,7 @@ Example script:
4951

5052
#!/bin/bash -e
5153
docker run --name ldap-service --hostname ldap-service --detach osixia/openldap:1.1.8
52-
docker run --name phpldapadmin-service --hostname phpldapadmin-service --link ldap-service:ldap-host --env PHPLDAPADMIN_LDAP_HOSTS=ldap-host --detach osixia/phpldapadmin:0.7.1
54+
docker run --name phpldapadmin-service --hostname phpldapadmin-service --link ldap-service:ldap-host --env PHPLDAPADMIN_LDAP_HOSTS=ldap-host --detach osixia/phpldapadmin:0.7.2
5355

5456
PHPLDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" phpldapadmin-service)
5557

@@ -66,7 +68,7 @@ but setting your own config.php is possible. 2 options:
6668

6769
- Link your config file at run time to `/container/service/phpldapadmin/assets/config/config.php` :
6870

69-
docker run --volume /data/my-config.php:/container/service/phpldapadmin/assets/config/config.php --detach osixia/phpldapadmin:0.7.1
71+
docker run --volume /data/my-config.php:/container/service/phpldapadmin/assets/config/config.php --detach osixia/phpldapadmin:0.7.2
7072

7173
- Add your config file by extending or cloning this image, please refer to the [Advanced User Guide](#advanced-user-guide)
7274

@@ -75,7 +77,7 @@ but setting your own config.php is possible. 2 options:
7577
#### Use autogenerated certificate
7678
By default HTTPS is enable, a certificate is created with the container hostname (it can be set by docker run --hostname option eg: phpldapadmin.my-company.com).
7779

78-
docker run --hostname phpldapadmin.my-company.com --detach osixia/phpldapadmin:0.7.1
80+
docker run --hostname phpldapadmin.my-company.com --detach osixia/phpldapadmin:0.7.2
7981

8082
#### Use your own certificate
8183

@@ -85,22 +87,22 @@ You can set your custom certificate at run time, by mounting a directory contain
8587
--env PHPLDAPADMIN_HTTPS_CRT_FILENAME=my-cert.crt \
8688
--env PHPLDAPADMIN_HTTPS_KEY_FILENAME=my-cert.key \
8789
--env PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME=the-ca.crt \
88-
--detach osixia/phpldapadmin:0.7.1
90+
--detach osixia/phpldapadmin:0.7.2
8991

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

9294
#### Disable HTTPS
9395
Add --env PHPLDAPADMIN_HTTPS=false to the run command :
9496

95-
docker run --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.7.1
97+
docker run --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.7.2
9698

9799
### Fix docker mounted file problems
98100

99101
You may have some problems with mounted files on some systems. The startup script try to make some file adjustment and fix files owner and permissions, this can result in multiple errors. See [Docker documentation](https://docs.docker.com/v1.4/userguide/dockervolumes/#mount-a-host-file-as-a-data-volume).
100102

101103
To fix that run the container with `--copy-service` argument :
102104

103-
docker run [your options] osixia/phpldapadmin:0.7.1 --copy-service
105+
docker run [your options] osixia/phpldapadmin:0.7.2 --copy-service
104106

105107
### Debug
106108

@@ -109,11 +111,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
109111

110112
Example command to run the container in `debug` mode:
111113

112-
docker run --detach osixia/phpldapadmin:0.7.1 --loglevel debug
114+
docker run --detach osixia/phpldapadmin:0.7.2 --loglevel debug
113115

114116
See all command line options:
115117

116-
docker run osixia/phpldapadmin:0.7.1 --help
118+
docker run osixia/phpldapadmin:0.7.2 --help
117119

118120
## Environment Variables
119121

@@ -166,10 +168,20 @@ See how to [set your own environment variables](#set-your-own-environment-variab
166168
167169
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
168170

169-
docker run --env PHPLDAPADMIN_LDAP_HOSTS="#PYTHON2BASH:[{'ldap.example.org': [{'server': [{'tls': True}]},{'login': [{'bind_id': 'cn=admin,dc=example,dc=org'}]}]}, 'ldap2.example.org', 'ldap3.example.org']" --detach osixia/phpldapadmin:0.7.1
171+
docker run --env PHPLDAPADMIN_LDAP_HOSTS="#PYTHON2BASH:[{'ldap.example.org': [{'server': [{'tls': True}]},{'login': [{'bind_id': 'cn=admin,dc=example,dc=org'}]}]}, 'ldap2.example.org', 'ldap3.example.org']" --detach osixia/phpldapadmin:0.7.2
170172

171173
To convert yaml to python online: http://yaml-online-parser.appspot.com/
172174

175+
If you would like to skip the display name == hostname element of the above use the **PHPLDAPADMIN_LDAP_HOSTS_FRIENDLY** environmental variable. This then uses the top most name as the display name of the server. You will then need to add host to the yaml within the server section. Note this is a global setting, if you do it for one server, you must do it for all. eg
176+
```yaml
177+
- Primary:
178+
- server:
179+
- host: ldap-master.example.org
180+
- Backup:
181+
- server:
182+
- host: 192.168.0.100
183+
```
184+
173185
Apache :
174186
- **PHPLDAPADMIN_SERVER_ADMIN**: Server admin email. Defaults to `[email protected]`
175187
- **PHPLDAPADMIN_SERVER_PATH**: Server path (usefull if behind a reverse proxy). Defaults to `/phpldapadmin`
@@ -203,14 +215,14 @@ Other environment variables:
203215
Environment variables can be set by adding the --env argument in the command line, for example:
204216

205217
docker run --env PHPLDAPADMIN_LDAP_HOSTS="ldap.example.org" \
206-
--detach osixia/phpldapadmin:0.7.1
218+
--detach osixia/phpldapadmin:0.7.2
207219

208220
#### Link environment file
209221

210222
For example if your environment file is in : /data/environment/my-env.yaml
211223

212224
docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
213-
--detach osixia/phpldapadmin:0.7.1
225+
--detach osixia/phpldapadmin:0.7.2
214226

215227
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).
216228

@@ -220,13 +232,13 @@ This is the best solution if you have a private registry. Please refer to the [A
220232

221233
## Advanced User Guide
222234

223-
### Extend osixia/phpldapadmin:0.7.1 image
235+
### Extend osixia/phpldapadmin:0.7.2 image
224236

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

227239
Dockerfile example:
228240

229-
FROM osixia/phpldapadmin:0.7.1
241+
FROM osixia/phpldapadmin:0.7.2
230242
MAINTAINER Your Name <[email protected]>
231243

232244
ADD https-certs /container/service/phpldapadmin/assets/apache2/certs
@@ -289,6 +301,11 @@ A kubernetes example is available in **example/kubernetes**
289301
This image is based on osixia/web-baseimage.
290302
More info: https://github.com/osixia/docker-web-baseimage
291303

304+
## Security
305+
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.
306+
307+
Please include as many details as possible.
308+
292309
## Changelog
293310

294311
Please refer to: [CHANGELOG.md](CHANGELOG.md)

‎example/kubernetes/phpldapadmin-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: phpldapadmin
18-
image: osixia/phpldapadmin:0.7.1
18+
image: osixia/phpldapadmin:0.7.2
1919
volumeMounts:
2020
- name: phpldapadmin-certs
2121
mountPath: /container/service/phpldapadmin/assets/apache2/certs

0 commit comments

Comments
 (0)