Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9b611e0

Browse files
web-baseimage:1.0.0
1 parent 33d94f3 commit 9b611e0

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
## 0.6.12
4+
- Upgrade baseimage: web-baseimage:1.0.0
5+
36
## 0.6.11
47
- Upgrade baseimage: web-baseimage:0.1.10
58

‎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.6.11
2+
VERSION = 0.6.12
33

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

‎README.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
Latest release: 0.6.11 - phpLDAPadlin 1.2.3 (with php5.5 patch) - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/phpldapadmin/)
8+
Latest release: 0.6.12 - phpLDAPadlin 1.2.3 (with php5.5 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)
@@ -26,7 +26,7 @@ A docker image to run phpLDAPadmin.
2626
- [Link environment file](#link-environment-file)
2727
- [Make your own image or extend this image](#make-your-own image-or-extend-this-image)
2828
- [Advanced User Guide](#advanced-user-guide)
29-
- [Extend osixia/phpldapadmin:0.6.11 image](#extend-osixiaphpldapadmin0611-image)
29+
- [Extend osixia/phpldapadmin:0.6.12 image](#extend-osixiaphpldapadmin0612-image)
3030
- [Make your own phpLDAPadmin image](#make-your-own-phpldapadmin-image)
3131
- [Tests](#tests)
3232
- [Kubernetes](#kubernetes)
@@ -39,7 +39,7 @@ Run a phpLDAPadmin docker image by replacing `ldap.example.com` with your ldap h
3939

4040
docker run -p 6443:443 \
4141
--env PHPLDAPADMIN_LDAP_HOSTS=ldap.example.com \
42-
--detach osixia/phpldapadmin:0.6.11
42+
--detach osixia/phpldapadmin:0.6.12
4343

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

@@ -50,7 +50,7 @@ Example script:
5050
#!/bin/bash -e
5151
docker run --name ldap-service --hostname ldap-service --detach osixia/openldap:1.1.1
5252

53-
docker run --name phpldapadmin-service --hostname phpldapadmin-service --link ldap-service:ldap-host --env PHPLDAPADMIN_LDAP_HOSTS=ldap-host --detach osixia/phpldapadmin:0.6.11
53+
docker run --name phpldapadmin-service --hostname phpldapadmin-service --link ldap-service:ldap-host --env PHPLDAPADMIN_LDAP_HOSTS=ldap-host --detach osixia/phpldapadmin:0.6.12
5454

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

@@ -67,7 +67,7 @@ but setting your own config.php is possible. 2 options:
6767

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

70-
docker run --volume /data/my-config.php:/container/service/phpldapadmin/assets/config.php --detach osixia/phpldapadmin:0.6.11
70+
docker run --volume /data/my-config.php:/container/service/phpldapadmin/assets/config.php --detach osixia/phpldapadmin:0.6.12
7171

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

@@ -76,7 +76,7 @@ but setting your own config.php is possible. 2 options:
7676
#### Use autogenerated certificate
7777
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).
7878

79-
docker run --hostname phpldapadmin.my-company.com --detach osixia/phpldapadmin:0.6.11
79+
docker run --hostname phpldapadmin.my-company.com --detach osixia/phpldapadmin:0.6.12
8080

8181
#### Use your own certificate
8282

@@ -86,22 +86,22 @@ You can set your custom certificate at run time, by mounting a directory contain
8686
--env PHPLDAPADMIN_HTTPS_CRT_FILENAME=my-cert.crt \
8787
--env PHPLDAPADMIN_HTTPS_KEY_FILENAME=my-cert.key \
8888
--env PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME=the-ca.crt \
89-
--detach osixia/phpldapadmin:0.6.11
89+
--detach osixia/phpldapadmin:0.6.12
9090

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

9393
#### Disable HTTPS
9494
Add --env PHPLDAPADMIN_HTTPS=false to the run command :
9595

96-
docker run --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.11
96+
docker run --env PHPLDAPADMIN_HTTPS=false --detach osixia/phpldapadmin:0.6.12
9797

9898
### Fix docker mounted file problems
9999

100100
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).
101101

102102
To fix that run the container with `--copy-service` argument :
103103

104-
docker run [your options] osixia/phpldapadmin:0.6.11 --copy-service
104+
docker run [your options] osixia/phpldapadmin:0.6.12 --copy-service
105105

106106
### Debug
107107

@@ -110,11 +110,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`.
110110

111111
Example command to run the container in `debug` mode:
112112

113-
docker run --detach osixia/phpldapadmin:0.6.11 --loglevel debug
113+
docker run --detach osixia/phpldapadmin:0.6.12 --loglevel debug
114114

115115
See all command line options:
116116

117-
docker run osixia/phpldapadmin:0.6.11 --help
117+
docker run osixia/phpldapadmin:0.6.12 --help
118118

119119
## Environment Variables
120120

@@ -167,7 +167,7 @@ See how to [set your own environment variables](#set-your-own-environment-variab
167167
168168
If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python:
169169

170-
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.6.11
170+
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.6.12
171171

172172
To convert yaml to python online: http://yaml-online-parser.appspot.com/
173173

@@ -204,14 +204,14 @@ Other environment variables:
204204
Environment variables can be set by adding the --env argument in the command line, for example:
205205

206206
docker run --env PHPLDAPADMIN_LDAP_HOSTS="ldap.example.org" \
207-
--detach osixia/phpldapadmin:0.6.11
207+
--detach osixia/phpldapadmin:0.6.12
208208

209209
#### Link environment file
210210

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

213213
docker run --volume /data/environment/my-env.yaml:/container/environment/01-custom/env.yaml \
214-
--detach osixia/phpldapadmin:0.6.11
214+
--detach osixia/phpldapadmin:0.6.12
215215

216216
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).
217217

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

222222
## Advanced User Guide
223223

224-
### Extend osixia/phpldapadmin:0.6.11 image
224+
### Extend osixia/phpldapadmin:0.6.12 image
225225

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

228228
Dockerfile example:
229229

230-
FROM osixia/phpldapadmin:0.6.11
230+
FROM osixia/phpldapadmin:0.6.12
231231
MAINTAINER Your Name <your@name.com>
232232

233233
ADD https-certs /container/service/phpldapadmin/assets/apache2/certs
@@ -249,7 +249,7 @@ Clone this project :
249249
Adapt Makefile, set your image NAME and VERSION, for example :
250250

251251
NAME = osixia/phpldapadmin
252-
VERSION = 0.6.11
252+
VERSION = 0.6.12
253253

254254
becomes :
255255
NAME = billy-the-king/phpldapadmin

‎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.6.11
18+
image: osixia/phpldapadmin:0.6.12
1919
volumeMounts:
2020
- name: phpldapadmin-certs
2121
mountPath: /container/service/phpldapadmin/assets/apache2/certs

‎image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM osixia/web-baseimage:0.1.11
1+
FROM osixia/web-baseimage:1.0.0
22
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
33

44
# phpLDAPadmin version

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /