Skip to content

Commit ddb784d

Browse files
BertrandGounyBertrandGouny
committed
v0.7.2
1 parent 64aa073 commit ddb784d

File tree

5 files changed

+147
-90
lines changed

5 files changed

+147
-90
lines changed

‎CHANGELOG.md‎

Lines changed: 83 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,111 @@
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+
9+
## [0.7.1] - 2017-12-05
10+
### Added
11+
- Opcache config
12+
13+
### Changed
414
- Optimise apache config
5-
- Add opcache config
6-
- Upgrade baseimage: web-baseimage:1.1.1
15+
- Upgrade baseimage to web-baseimage:1.1.1
716

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

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

16-
## 0.6.11
17-
- Upgrade baseimage: web-baseimage:0.1.10
31+
## [0.6.11] - 2016-09-02
32+
### Changed
33+
- Upgrade baseimage to web-baseimage:0.1.10
1834

19-
## 0.6.10
35+
## [0.6.10] - 2016-07-26
36+
### Added
2037
- Add PHPLDAPADMIN_SERVER_PATH environment variable
2138

22-
## 0.6.9
23-
- Upgrade baseimage: web-baseimage:0.1.10
39+
## [0.6.9] - 2016-06-09
40+
### Changed
41+
- Upgrade baseimage to web-baseimage:0.1.10
2442

25-
## 0.6.8
26-
- Upgrade baseimage: web-baseimage:0.1.9
43+
## [0.6.8] - 2016-02-20
44+
### Changed
45+
- Upgrade baseimage to web-baseimage:0.1.9
2746

28-
## 0.6.7
29-
- Upgrade baseimage: web-baseimage:0.1.8
47+
## [0.6.7] - 2016-01-25
48+
### Changed
49+
- Upgrade baseimage to web-baseimage:0.1.8
3050

31-
## 0.6.6
32-
- Upgrade baseimage: web-baseimage:0.1.7
51+
## [0.6.6] - 2015-12-16
52+
### Added
3353
- Makefile with build no cache
3454

35-
## 0.6.5
36-
- Upgrade baseimage: web-baseimage:0.1.6
55+
### Changed
56+
- Upgrade baseimage to web-baseimage:0.1.7
3757

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

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

46-
## 0.6.2
74+
## [0.6.2] - 2015-08-21
75+
### Changed
4776
- Better way to add custom config
4877

49-
## 0.6.1
50-
- Upgrade baseimage: web-baseimage:0.1.1
78+
## [0.6.1] - 2015-08-20
79+
### Changed
80+
- Upgrade baseimage to web-baseimage:0.1.1
5181
- Rename environment variables
5282

53-
## 0.6.0
83+
## [0.6.0] - 2015-07-24
84+
### Changed
5485
- Use new baseimage: light-baseimage
5586

56-
## 0.5.1
87+
## [0.5.1] - 2015-05-17
88+
### Fixed
5789
- Fix #1 (can't activate SSL with own certificates)
5890

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

@@ -203,14 +205,14 @@ Other environment variables:
203205
Environment variables can be set by adding the --env argument in the command line, for example:
204206

205207
docker run --env PHPLDAPADMIN_LDAP_HOSTS="ldap.example.org" \
206-
--detach osixia/phpldapadmin:0.7.1
208+
--detach osixia/phpldapadmin:0.7.2
207209

208210
#### Link environment file
209211

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

212214
docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
213-
--detach osixia/phpldapadmin:0.7.1
215+
--detach osixia/phpldapadmin:0.7.2
214216

215217
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).
216218

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

221223
## Advanced User Guide
222224

223-
### Extend osixia/phpldapadmin:0.7.1 image
225+
### Extend osixia/phpldapadmin:0.7.2 image
224226

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

227229
Dockerfile example:
228230

229-
FROM osixia/phpldapadmin:0.7.1
231+
FROM osixia/phpldapadmin:0.7.2
230232
MAINTAINER Your Name <your@name.com>
231233

232234
ADD https-certs /container/service/phpldapadmin/assets/apache2/certs
@@ -289,6 +291,11 @@ A kubernetes example is available in **example/kubernetes**
289291
This image is based on osixia/web-baseimage.
290292
More info: https://github.com/osixia/docker-web-baseimage
291293

294+
## Security
295+
If you discover a security vulnerability within this docker image, please send an email to the Osixia! team at security@osixia.net. For minor vulnerabilities feel free to add an issue here on github.
296+
297+
Please include as many details as possible.
298+
292299
## Changelog
293300

294301
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

‎image/Dockerfile‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM osixia/web-baseimage:1.1.1
2-
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
32

43
# phpLDAPadmin version
54
ARG PHPLDAPADMIN_VERSION=1.2.3
@@ -15,23 +14,23 @@ ARG PHPLDAPADMIN_SHA1=669fca66c75e24137e106fdd02e3832f81146e23
1514
# Download phpLDAPadmin, check file integrity, and unzip phpLDAPadmin to /var/www/phpldapadmin_bootstrap
1615
# Remove curl
1716
RUN apt-get update \
18-
&& /container/tool/add-multiple-process-stack \
19-
&& /container/tool/add-service-available :apache2 :php7.0-fpm :ssl-tools \
20-
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
21-
ca-certificates \
22-
curl \
23-
patch \
24-
php7.0-ldap \
25-
php7.0-readline \
26-
php7.0-xml \
27-
&& curl -o phpldapadmin.tgz -SL https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${PHPLDAPADMIN_VERSION}/phpldapadmin-${PHPLDAPADMIN_VERSION}.tgz \
28-
&& echo "$PHPLDAPADMIN_SHA1 *phpldapadmin.tgz" | sha1sum -c - \
29-
&& mkdir -p /var/www/phpldapadmin_bootstrap /var/www/phpldapadmin \
30-
&& tar -xzf phpldapadmin.tgz --strip 1 -C /var/www/phpldapadmin_bootstrap \
31-
&& apt-get remove -y --purge --auto-remove curl ca-certificates \
32-
&& rm phpldapadmin.tgz \
33-
&& apt-get clean \
34-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
17+
&& /container/tool/add-multiple-process-stack \
18+
&& /container/tool/add-service-available :apache2 :php7.0-fpm :ssl-tools \
19+
&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
20+
ca-certificates \
21+
curl \
22+
patch \
23+
php7.0-ldap \
24+
php7.0-readline \
25+
php7.0-xml \
26+
&& curl -o phpldapadmin.tgz -SL https://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${PHPLDAPADMIN_VERSION}/phpldapadmin-${PHPLDAPADMIN_VERSION}.tgz \
27+
&& echo "$PHPLDAPADMIN_SHA1 *phpldapadmin.tgz" | sha1sum -c - \
28+
&& mkdir -p /var/www/phpldapadmin_bootstrap /var/www/phpldapadmin \
29+
&& tar -xzf phpldapadmin.tgz --strip 1 -C /var/www/phpldapadmin_bootstrap \
30+
&& apt-get remove -y --purge --auto-remove curl ca-certificates \
31+
&& rm phpldapadmin.tgz \
32+
&& apt-get clean \
33+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
3534

3635
# Add service directory to /container/service
3736
ADD service /container/service

0 commit comments

Comments
 (0)