bootstrap

Author: BertrandGouny

image/Dockerfile

@@ -5,30 +5,27 @@ MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 ENV PHPLDAPADMIN_VERSION 1.2.3
 ENV PHPLDAPADMIN_SHA1 669fca66c75e24137e106fdd02e3832f81146e23
 
-# Set correct environment variables.
-ENV HOME /root
-
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 
 # Install apache2 and php5-fpm using osixia/baseimage utils
 # Caution: /sbin/enable-service arguments order is important
 # php5-fpm install will detect apache2 and configure it
 
-# Download, check integrity and unzip phpLDAPadmin to /var/www/phpldapadmin
+# Download, check integrity and unzip phpLDAPadmin to /var/www/phpldapadmin_bootstrap
 RUN apt-get update && /sbin/enable-service apache2 php5-fpm ssl-kit \
 	&& LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends patch php5-ldap php5-readline \
 	&& curl -o phpldapadmin.tgz -SL http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/${PHPLDAPADMIN_VERSION}/phpldapadmin-${PHPLDAPADMIN_VERSION}.tgz \
 	&& echo "$PHPLDAPADMIN_SHA1 *phpldapadmin.tgz" | sha1sum -c - \
-	&& mkdir -p /var/www/phpldapadmin \
-	&& tar -xzf phpldapadmin.tgz --strip 1 -C /var/www/phpldapadmin
+	&& mkdir -p /var/www/phpldapadmin_bootstrap /var/www/phpldapadmin \
+	&& tar -xzf phpldapadmin.tgz --strip 1 -C /var/www/phpldapadmin_bootstrap
 
 # Add install script and phpLDAPadmin assets
 ADD service/install.sh /tmp/install.sh
 ADD service/phpldapadmin/assets /osixia/phpldapadmin
 
 # Run install script and clean all
-RUN ./tmp/install.sh && rm /tmp/install.sh \
+RUN ./tmp/install.sh \
 	&& rm phpldapadmin.tgz \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
@@ -38,7 +35,7 @@ ADD env.yml /etc/env.yml
 # Add phpLDAPadmin container start config
 ADD service/phpldapadmin/container-start.sh /etc/my_init.d/phpldapadmin
 
-# Set wordpress data directory in a data volume
+# Set phpLDAPadmin data directory in a data volume
 VOLUME ["/var/www/phpldapadmin"]
 
 # Expose http and https default ports

image/service/install.sh

@@ -4,7 +4,7 @@
 # Add phpLDAPadmin virtualhosts
 ln -s /osixia/phpldapadmin/apache2/phpldapadmin.conf /etc/apache2/sites-available/phpldapadmin.conf
 ln -s /osixia/phpldapadmin/apache2/phpldapadmin-ssl.conf /etc/apache2/sites-available/phpldapadmin-ssl.conf
-ln -s /osixia/phpldapadmin/config.php /var/www/phpldapadmin/config/config.php
+ln -s /osixia/phpldapadmin/config.php /var/www/phpldapadmin_bootstrap/config/config.php
 
 cat /osixia/phpldapadmin/php5-fpm/pool.conf >> /etc/php5/fpm/pool.d/www.conf
 
@@ -16,10 +16,10 @@ a2dissite 000-default
 rm -rf /var/www/html
 
 # Delete unnecessary files
-rm -rf /var/www/phpldapadmin/doc
+rm -rf /var/www/phpldapadmin_bootstrap/doc
 
 # apply php5.5 patch
-patch -p1 -d /var/www/phpldapadmin < /osixia/phpldapadmin/php5.5.patch
+patch -p1 -d /var/www/phpldapadmin_bootstrap < /osixia/phpldapadmin/php5.5.patch
 
 # fix php5-fpm $_SERVER['SCRIPT_NAME'] bad value with cgi.fix_pathinfo=0
-sed -i "s/'SCRIPT_NAME'/'PATH_INFO'/g" /var/www/phpldapadmin/lib/common.php
+sed -i "s/'SCRIPT_NAME'/'PATH_INFO'/g" /var/www/phpldapadmin_bootstrap/lib/common.php

image/service/phpldapadmin/assets/config.php

@@ -52,10 +52,6 @@
 
 $servers = new Datastore();
 
-/* $servers->NewServer('ldap_pla') must be called before each new LDAP server
-   declaration. */
-$servers->newServer('ldap_pla');
-
 /*
  * Autogenerated servers will come here
  */

image/service/phpldapadmin/container-start.sh

@@ -5,6 +5,12 @@ FIRST_START_DONE="/etc/docker-phpldapadmin-first-start-done"
 # container first start
 if [ ! -e "$FIRST_START_DONE" ]; then
 
+  # phpLDAPadmin directory is empty, we use the bootstrap
+  if [ ! "$(ls -A /var/www/phpldapadmin)" ]; then
+    cp -R /var/www/phpldapadmin_bootstrap/* /var/www/phpldapadmin
+    rm -rf /var/www/phpldapadmin_bootstrap
+  fi
+
   # create phpLDAPadmin vhost
   if [ "${HTTPS,,}" == "true" ]; then