Merge branch 'hotfix-0.6.1' into stable

BertrandGouny · BertrandGouny · commit 31540798768e · 2015-08-20T11:25:01.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.1
+  - Upgrade baseimage: osixia/web-baseimage:0.1.1
+  - Rename environment variables
+
 ## 0.6.0
   - Use new baseimage: osixia/light-baseimage
 
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/phpldapadmin
-VERSION = 0.6.0
+VERSION = 0.6.1
 
 .PHONY: all build test tag_latest release
 
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ A docker image to run phpLDAPadmin.
 Run a phpLDAPadmin docker image by replacing `ldap.example.com` with your ldap host or IP :
 
     sudo docker run -p 443:443 \
-               -e LDAP_HOSTS=ldap.example.com \
+               -e PHPLDAPADMIN_LDAP_HOSTS=ldap.example.com \
                -d osixia/phpldapadmin
 
 That's it :) you can access phpLDAPadmin on **https://localhost**
@@ -25,11 +25,11 @@ Example script:
     #!/bin/bash -e
 
     # Run a ldap server, save the container id in LDAP_CID and get its IP:
-    LDAP_CID=$(docker run -h ldap.example.org -d osixia/openldap:1.0.0)
+    LDAP_CID=$(docker run -h ldap.example.org -d osixia/openldap:1.0.1)
     LDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP_CID)
 
     # Run phpLDAPadmin and set ldap host to ldap ip
-    PHPLDAP_CID=$(docker run -h phpldapadmin.example.org -e LDAP_HOSTS=$LDAP_IP -d osixia/phpldapadmin:0.6.0)
+    PHPLDAP_CID=$(docker run -h phpldapadmin.example.org -e PHPLDAPADMIN_LDAP_HOSTS=$LDAP_IP -d osixia/phpldapadmin:0.6.1)
 
     # We get phpLDAPadmin container ip
     PHPLDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $PHPLDAP_CID)
@@ -47,28 +47,28 @@ By default HTTPS is enable, a certificate is created with the container hostname
 
 #### Use your own certificate
 
-Add your custom certificate, private key and CA certificate in the directory **image/service/phpldapadmin/assets/apache2/ssl** adjust filename in **image/env.yaml** and rebuild the image ([see manual build](#manual-build)).
+Add your custom certificate, private key and CA certificate in the directory **image/service/phpldapadmin/assets/apache2/certs** adjust filename in **image/env.yaml** and rebuild the image ([see manual build](#manual-build)).
 
-Or you can set your custom certificate at run time, by mouting your a directory containing thoses files to **/container/service/phpldapadmin/assets/apache2/ssl** and adjust there name with the following environment variables :
+Or you can set your custom certificate at run time, by mouting your a directory containing thoses files to **/container/service/phpldapadmin/assets/apache2/certs** and adjust there name with the following environment variables :
 
-	docker run -v /path/to/certifates:/container/service/phpldapadmin/assets/apache2/ssl \
-	-e SSL_CRT_FILENAME=my-phpldapadmin.crt \
-	-e SSL_KEY_FILENAME=my-phpldapadmin.key \
-	-e SSL_CA_CRT_FILENAME=the-ca.crt \
+	docker run -v /path/to/certifates:/container/service/phpldapadmin/assets/apache2/certs \
+	-e PHPLDAPADMIN_HTTPS_CRT_FILENAME=my-phpldapadmin.crt \
+	-e PHPLDAPADMIN_HTTPS_KEY_FILENAME=my-phpldapadmin.key \
+	-e PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME=the-ca.crt \
 	-d osixia/phpldapadmin
 
-Ommit the -e SSL_CA_CRT_FILENAME variable for self signed certificates
+Ommit the -e PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME variable for self signed certificates
 
 #### Disable HTTPS
-Add -e HTTPS=false to the run command :
+Add -e PHPLDAPADMIN_HTTPS=false to the run command :
 
-    docker run -e HTTPS=false -d osixia/phpldapadmin
+    docker run -e PHPLDAPADMIN_HTTPS=false -d osixia/phpldapadmin
 
 ## Environment Variables
 
 Environement variables defaults are set in **image/env.yaml**. You can modify environment variable values directly in this file and rebuild the image ([see manual build](#manual-build)). You can also override those values at run time with -e argument or by setting your own env.yaml file as a docker volume to `/etc/env.yaml`. See examples below.
 
-- **LDAP_HOSTS**: Set phpLDAPadmin server config. Defaults to :
+- **PHPLDAPADMIN_LDAP_HOSTS**: Set phpLDAPadmin server config. Defaults to :
 
 		   - ldap.example.org:
 		    - server:
@@ -94,35 +94,35 @@ Environement variables defaults are set in **image/env.yaml**. You can modify en
 
 	If you want to set this variable at docker run command convert the yaml in python :
 
-		docker run -e LDAP_HOSTS="[{'ldap.example.org': [{'server': [{'tls': True}]},{'login': [{'bind_id': 'cn=admin,dc=example,dc=org'}]}]}, 'ldap2.example.org', 'ldap3.example.org']" -d osixia/phpldapadmin
+		docker run -e PHPLDAPADMIN_LDAP_HOSTS="[{'ldap.example.org': [{'server': [{'tls': True}]},{'login': [{'bind_id': 'cn=admin,dc=example,dc=org'}]}]}, 'ldap2.example.org', 'ldap3.example.org']" -d osixia/phpldapadmin
 
 	To convert yaml to python online :
 	http://yaml-online-parser.appspot.com/
 
 Apache config :
-- **SERVER_ADMIN**: Server admin email. Defaults to `webmaster@example.org`
+- **PHPLDAPADMIN_SERVER_ADMIN**: Server admin email. Defaults to `webmaster@example.org`
 
-HTTPS options :
-- **HTTPS**: Use apache ssl config. Defaults to `true`
-- **SSL_CRT_FILENAME**: Apache ssl certificate filename. Defaults to `phpldapadmin.crt`
-- **SSL_KEY_FILENAME**: Apache ssl certificate private key filename. Defaults to `phpldapadmin.key`
-- **SSL_CA_CRT_FILENAME**: Apache ssl CA certificate filename. Defaults to `ca.crt`
+PHPLDAPADMIN_HTTPS options :
+- **PHPLDAPADMIN_HTTPS**: Use apache ssl config. Defaults to `true`
+- **PHPLDAPADMIN_HTTPS_CRT_FILENAME**: Apache ssl certificate filename. Defaults to `phpldapadmin.crt`
+- **PHPLDAPADMIN_HTTPS_KEY_FILENAME**: Apache ssl certificate private key filename. Defaults to `phpldapadmin.key`
+- **PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME**: Apache ssl CA certificate filename. Defaults to `ca.crt`
 
 Ldap client TLS/LDAPS options :
 
-- **USE_LDAP_CLIENT_SSL**: Enable ldap client tls config, ldap serveur certificate check and set client  certificate. Defaults to `true`
-- **LDAP_REQCERT**: Set ldap.conf TLS_REQCERT. Defaults to `demand`
-- **LDAP_CA_CRT_FILENAME**: Set ldap.conf TLS_CACERT to /container/service/phpldapadmin/ssl/$LDAP_CA_CRT_FILENAME. Defaults to `ldap-ca.crt`
-- **LDAP_CRT_FILENAME**: Set .ldaprc TLS_CERT to /container/service/phpldapadmin/ssl/$LDAP_CRT_FILENAME. Defaults to `ldap-client.crt`
-- **LDAP_KEY_FILENAME**: Set .ldaprc TLS_KEY to /container/service/phpldapadmin/ssl/$LDAP_KEY_FILENAME. Defaults to `ldap-client.key`
+- **PHPLDAPADMIN_LDAP_CLIENT_TLS**: Enable ldap client tls config, ldap serveur certificate check and set client  certificate. Defaults to `true`
+- **PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT**: Set ldap.conf TLS_REQCERT. Defaults to `demand`
+- **PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME**: Set ldap.conf TLS_CACERT to /container/service/phpldapadmin/assets/ldap-client/certs/$PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME. Defaults to `ldap-ca.crt`
+- **PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME**: Set .ldaprc TLS_CERT to /container/service/phpldapadmin/assets/ldap-client/certs/$PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME. Defaults to `ldap-client.crt`
+- **PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME**: Set .ldaprc TLS_KEY to /container/service/phpldapadmin/assets/ldap-client/certs/$PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME. Defaults to `ldap-client.key`
 
 	More information at : http://www.openldap.org/doc/admin24/tls.html (16.2.2. Client Configuration)
 
 ### Set environment variables at run time :
 
 Environment variable can be set directly by adding the -e argument in the command line, for example :
 
-	docker run -h phpldapadmin.example.org -e LDAP_HOSTS="ldap.example.org" \
+	docker run -h phpldapadmin.example.org -e PHPLDAPADMIN_LDAP_HOSTS="ldap.example.org" \
 	-d osixia/phpldapadmin
 
 Or by setting your own `env.yaml` file as a docker volume to `/etc/env.yaml`
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/web-baseimage:0.1.0
+FROM osixia/web-baseimage:0.1.1
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # phpLDAPadmin version
@@ -10,7 +10,7 @@ ENV PHPLDAPADMIN_SHA1 669fca66c75e24137e106fdd02e3832f81146e23
 CMD ["/container/tool/run"]
 
 # Install apache2 and php5-fpm using osixia/baseimage utils
-# Caution: /sbin/add-service-available arguments order is important
+# Caution: /container/tool/install-service-available arguments order is important
 # php5-fpm install will detect apache2 and configure it
 
 # Download, check integrity and unzip phpLDAPadmin to /var/www/phpldapadmin_bootstrap
diff --git a/image/env.yaml b/image/env.yaml
@@ -1,4 +1,4 @@
-LDAP_HOSTS:
+PHPLDAPADMIN_LDAP_HOSTS:
   - ldap.example.org:
     - server:
       - tls: true
@@ -8,25 +8,22 @@ LDAP_HOSTS:
   - ldap3.example.org
 
 # Apache
-SERVER_ADMIN: webmaster@example.org
+PHPLDAPADMIN_SERVER_ADMIN: webmaster@example.org
 
 # Self signed certificat will be generated
-# if HTTPS is set to true and no certificat and key are provided.
+# if PHPLDAPADMIN_HTTPS is set to true and no certificat and key are provided.
 
 # To use your custom certificat and key 2 options :
-# - add them in service/phpldapadmin/assets/apache2/ssl and build the image
-# - or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/apache2/ssl
-HTTPS: true
-SSL_CRT_FILENAME: phpldapadmin.crt
-SSL_KEY_FILENAME: phpldapadmin.key
-SSL_CA_CRT_FILENAME: ca.crt
+# - add them in service/phpldapadmin/assets/apache2/certs and build the image
+# - or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/apache2/certs
+PHPLDAPADMIN_HTTPS: true
+PHPLDAPADMIN_HTTPS_CRT_FILENAME: phpldapadmin.crt
+PHPLDAPADMIN_HTTPS_KEY_FILENAME: phpldapadmin.key
+PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME: ca.crt
 
-# LDAP certificate
-USE_LDAP_CLIENT_SSL: true
-
-LDAP_REQCERT: demand
-LDAP_CA_CRT_FILENAME: ldap-ca.crt
-
-# client certificate
-LDAP_CRT_FILENAME: ldap-client.crt
-LDAP_KEY_FILENAME: ldap-client.key
+# LDAP client tls config
+PHPLDAPADMIN_LDAP_CLIENT_TLS: true
+PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT: demand
+PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME: ldap-ca.crt
+PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME: ldap-client.crt
+PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME: ldap-client.key
diff --git a/image/service/phpldapadmin/assets/apache2/certs/README.md b/image/service/phpldapadmin/assets/apache2/certs/README.md
@@ -0,0 +1,2 @@
+Add your https server certificate, key and the CA certificate (if any) here
+or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/apache2/certs
diff --git a/image/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf b/image/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf
@@ -7,7 +7,7 @@
 	<VirtualHost _default_:443>
 
 		ServerName ${HOSTNAME}
-		ServerAdmin ${SERVER_ADMIN}
+		ServerAdmin ${PHPLDAPADMIN_SERVER_ADMIN}
 		ServerPath /phpldapadmin
 
 		DocumentRoot /var/www/phpldapadmin/htdocs
@@ -17,9 +17,9 @@
 
 		Include /etc/apache2/conf-available/vhost-partial-ssl.conf
 
-		SSLCertificateFile    /container/service/phpldapadmin/assets/apache2/ssl/${SSL_CRT_FILENAME}
-		SSLCertificateKeyFile /container/service/phpldapadmin/assets/apache2/ssl/${SSL_KEY_FILENAME}
-		#SSLCACertificateFile /container/service/phpldapadmin/assets/apache2/ssl/${SSL_CA_CRT_FILENAME}
+		SSLCertificateFile    /container/service/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_CRT_FILENAME}
+		SSLCertificateKeyFile /container/service/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_KEY_FILENAME}
+		#SSLCACertificateFile /container/service/phpldapadmin/assets/apache2/certs/${PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME}
 
 		<Directory /var/www/phpldapadmin/htdocs >
 			Require all granted
diff --git a/image/service/phpldapadmin/assets/apache2/phpldapadmin.conf b/image/service/phpldapadmin/assets/apache2/phpldapadmin.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
 
 	ServerName ${HOSTNAME}
-	ServerAdmin ${SERVER_ADMIN}
+	ServerAdmin ${PHPLDAPADMIN_SERVER_ADMIN}
 	ServerPath /phpldapadmin
 
 	DocumentRoot /var/www/phpldapadmin/htdocs
diff --git a/image/service/phpldapadmin/assets/apache2/ssl/README.md b/image/service/phpldapadmin/assets/apache2/ssl/README.md
diff --git a/image/service/phpldapadmin/assets/config.php b/image/service/phpldapadmin/assets/config.php
@@ -28,7 +28,7 @@
 /*
  * Autogenerated value will be automatically added by phpldapadmin/container-start.sh
  */
- $config->custom->session['blowfish'] = '';
+ $config->custom->session['blowfish'] = '{{ PHPMYADMIN_CONFIG_BLOWFISH }}';
 
 
 /*********************************************
@@ -39,8 +39,6 @@
 
 
 
-
-
 /*********************************************
  * User-friendly attribute translation       *
  *********************************************/
diff --git a/image/service/phpldapadmin/assets/ldap-client/certs/README.md b/image/service/phpldapadmin/assets/ldap-client/certs/README.md
@@ -0,0 +1,2 @@
+Add your ldap client certificate, key and CA certificate here
+or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/ldap-client/certs
diff --git a/image/service/phpldapadmin/assets/ssl/README.md b/image/service/phpldapadmin/assets/ssl/README.md
diff --git a/image/service/phpldapadmin/container-start.sh b/image/service/phpldapadmin/container-start.sh
@@ -6,13 +6,13 @@ FIRST_START_DONE="/etc/docker-phpldapadmin-first-start-done"
 if [ ! -e "$FIRST_START_DONE" ]; then
 
   # create phpLDAPadmin vhost
-  if [ "${HTTPS,,}" == "true" ]; then
+  if [ "${PHPLDAPADMIN_HTTPS,,}" == "true" ]; then
 
     # check certificat and key or create it
-    /sbin/ssl-helper "/container/service/phpldapadmin/assets/apache2/ssl/$SSL_CRT_FILENAME" "/container/service/phpldapadmin/assets/apache2/ssl/$SSL_KEY_FILENAME" --ca-crt=/container/service/phpldapadmin/assets/apache2/ssl/$SSL_CA_CRT_FILENAME
+    /sbin/ssl-helper "/container/service/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CRT_FILENAME" "/container/service/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_KEY_FILENAME" --ca-crt=/container/service/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME
 
     # add CA certificat config if CA cert exists
-    if [ -e "/container/service/phpldapadmin/assets/apache2/ssl/$SSL_CA_CRT_FILENAME" ]; then
+    if [ -e "/container/service/phpldapadmin/assets/apache2/certs/$PHPLDAPADMIN_HTTPS_CA_CRT_FILENAME" ]; then
       sed -i "s/#SSLCACertificateFile/SSLCACertificateFile/g" /container/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf
     fi
 
@@ -28,12 +28,12 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     rm -rf /var/www/phpldapadmin_bootstrap
 
     get_salt() {
-      salt=$(</dev/urandom tr -dc '1324567890#<>,()*.^@$% =-_~;:|{}[]+!`azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN' | head -c64 | tr -d '\\')
+      salt=$(</dev/urandom tr -dc '1324567890#<>,()*.^@$% =-_~;:/{}[]+!`azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN' | head -c64 | tr -d '\\')
     }
 
     # phpLDAPadmin cookie secret
     get_salt
-    sed -i "s/blowfish'] = '/blowfish'] = '${salt}/g" /var/www/phpldapadmin/config/config.php
+    sed -i "s|{{ PHPMYADMIN_CONFIG_BLOWFISH }}|${salt}|g" /var/www/phpldapadmin/config/config.php
 
     print_by_php_type() {
 
@@ -91,11 +91,11 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     }
 
     # phpLDAPadmin config
-    LDAP_HOSTS=($LDAP_HOSTS)
-    for host in "${LDAP_HOSTS[@]}"
+    PHPLDAPADMIN_LDAP_HOSTS=($PHPLDAPADMIN_LDAP_HOSTS)
+    for host in "${PHPLDAPADMIN_LDAP_HOSTS[@]}"
     do
 
-      #host var contain a variable name, we access to the variable value and cast it to a table
+      # host var contain a variable name, we access to the variable value and cast it to a table
       infos=(${!host})
 
       echo "\$servers->newServer('ldap_pla');" >> /var/www/phpldapadmin/config/config.php
@@ -119,28 +119,28 @@ if [ ! -e "$FIRST_START_DONE" ]; then
       fi
     done
 
-    if [ "${USE_LDAP_CLIENT_SSL,,}" == "true" ]; then
+    if [ "${PHPLDAPADMIN_LDAP_CLIENT_TLS,,}" == "true" ]; then
 
       # check certificat and key or create it
-      /sbin/ssl-helper "/container/service/phpldapadmin/assets/ssl/${LDAP_CRT_FILENAME}" "/container/service/phpldapadmin/assets/ssl/${LDAP_KEY_FILENAME}" --ca-crt=/container/service/phpldapadmin/assets/ssl/${LDAP_CA_CRT_FILENAME} --gnutls
+      /sbin/ssl-helper "/container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" "/container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" --ca-crt=/container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME} --gnutls
 
       # ldap client config
-      sed -i "s,TLS_CACERT.*,TLS_CACERT /container/service/phpldapadmin/assets/ssl/${LDAP_CA_CRT_FILENAME},g" /etc/ldap/ldap.conf
-      echo "TLS_REQCERT $LDAP_REQCERT" >> /etc/ldap/ldap.conf
+      sed -i "s,TLS_CACERT.*,TLS_CACERT /container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME},g" /etc/ldap/ldap.conf
+      echo "TLS_REQCERT $PHPLDAPADMIN_LDAP_CLIENT_TLS_REQCERT" >> /etc/ldap/ldap.conf
 
       www_data_homedir=$( getent passwd "www-data" | cut -d: -f6 )
 
       [[ -f "$www_data_homedir/.ldaprc" ]] && rm -f $www_data_homedir/.ldaprc
       touch $www_data_homedir/.ldaprc
-      echo "TLS_CERT /container/service/phpldapadmin/assets/ssl/${LDAP_CRT_FILENAME}" >> $www_data_homedir/.ldaprc
-      echo "TLS_KEY /container/service/phpldapadmin/assets/ssl/${LDAP_KEY_FILENAME}" >> $www_data_homedir/.ldaprc
+      echo "TLS_CERT /container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" >> $www_data_homedir/.ldaprc
+      echo "TLS_KEY /container/service/phpldapadmin/assets/ldap-client/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" >> $www_data_homedir/.ldaprc
 
-      chown www-data:www-data -R /container/service/phpldapadmin/assets/ssl/
+      chown www-data:www-data -R /container/service/phpldapadmin/assets/ldap-client/certs/
     fi
 
   fi
 
-  # Fix file permission
+  # fix file permission
   find /var/www/ -type d -exec chmod 755 {} \;
   find /var/www/ -type f -exec chmod 644 {} \;
   chmod 400 /var/www/phpldapadmin/config/config.php
diff --git a/image/service/phpldapadmin/install.sh b/image/service/phpldapadmin/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 # this script is run during the image build
 
-# Add phpLDAPadmin virtualhosts
+# add phpLDAPadmin virtualhosts
 ln -s /container/service/phpldapadmin/assets/apache2/phpldapadmin.conf /etc/apache2/sites-available/phpldapadmin.conf
 ln -s /container/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf /etc/apache2/sites-available/phpldapadmin-ssl.conf
 
@@ -14,11 +14,11 @@ rm /container/service/phpldapadmin/assets/php5-fpm/pool.conf
 mkdir -p /var/www/tmp
 chown www-data:www-data /var/www/tmp
 
-# Remove apache default host
+# remove apache default host
 a2dissite 000-default
 rm -rf /var/www/html
 
-# Delete unnecessary files
+# delete unnecessary files
 rm -rf /var/www/phpldapadmin_bootstrap/doc
 
 # apply php5.5 patch
diff --git a/test/test.bats b/test/test.bats
@@ -29,11 +29,11 @@ load test_helper
   tmp_file="$BATS_TMPDIR/docker-test"
 
   # we start a new openldap container
-  LDAP_CID=$(docker run -d osixia/openldap:1.0.0)
+  LDAP_CID=$(docker run -d osixia/openldap:1.0.1)
   LDAP_IP=$(get_container_ip_by_cid $LDAP_CID)
 
   # we start the wordpress container and set DB_HOSTS
-  run_image -e LDAP_HOSTS=$LDAP_IP
+  run_image -e PHPLDAPADMIN_LDAP_HOSTS=$LDAP_IP
 
   # wait openldap
   wait_service_by_cid $LDAP_CID slapd

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Add your https server certificate, key and the CA certificate (if any) here`
	`2`	`+or during docker run mount a data volume with thoses files to /container/service/phpldapadmin/assets/apache2/certs`