Merge branch 'hotfix-0.6.6' into stable

Author: BertrandGouny

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.6
+  - Upgrade baseimage: web-baseimage:0.1.7
+  - Makefile with build no cache
+
 ## 0.6.5
   - Upgrade baseimage: web-baseimage:0.1.6
 

Makefile

@@ -1,13 +1,16 @@
 NAME = osixia/phpldapadmin
-VERSION = 0.6.5
+VERSION = 0.6.6
 
-.PHONY: all build test tag_latest release
+.PHONY: all build build-nocache test tag_latest release
 
 all: build
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
 
+build-nocache:
+	docker build -t $(NAME):$(VERSION) --no-cache --rm image
+
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 

image/Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/web-baseimage:0.1.6
+FROM osixia/web-baseimage:0.1.7
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # phpLDAPadmin version

image/service/ldap-client/container-start.sh

@@ -11,7 +11,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     /sbin/ssl-helper "/container/service/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CRT_FILENAME}" "/container/service/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_KEY_FILENAME}" --ca-crt=/container/service/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME} --gnutls
 
     # ldap client config
-    sed -i "s,TLS_CACERT.*,TLS_CACERT /container/service/ldap-client/assets/certs/${PHPLDAPADMIN_LDAP_CLIENT_TLS_CA_CRT_FILENAME},g" /etc/ldap/ldap.conf
+    sed -i --follow-symlinks "s,TLS_CACERT.*,TLS_CACERT /container/service/ldap-client/assets/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 )

image/service/phpldapadmin/container-start.sh

@@ -13,7 +13,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
 
     # add CA certificat config if CA cert exists
     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
+      sed -i --follow-symlinks "s/#SSLCACertificateFile/SSLCACertificateFile/g" /container/service/phpldapadmin/assets/apache2/phpldapadmin-ssl.conf
     fi
 
     a2ensite phpldapadmin-ssl
@@ -27,20 +27,20 @@ if [ ! -e "$FIRST_START_DONE" ]; then
     cp -R /var/www/phpldapadmin_bootstrap/* /var/www/phpldapadmin
     rm -rf /var/www/phpldapadmin_bootstrap
 
-    echo "link /container/service/phpldapadmin/assets/config.php to /var/www/phpldapadmin/config/config.php"
-    ln -s /container/service/phpldapadmin/assets/config.php /var/www/phpldapadmin/config/config.php
+    echo "copy /container/service/phpldapadmin/assets/config.php to /var/www/phpldapadmin/config/config.php"
+    cp -f /container/service/phpldapadmin/assets/config.php /var/www/phpldapadmin/config/config.php
 
     get_salt() {
       salt=$(</dev/urandom tr -dc '1324567890#<>,()*.^@$% =-_~;:/{}[]+!`azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN' | head -c64 | tr -d '\\')
     }
 
     # phpLDAPadmin cookie secret
     get_salt
-    sed -i "s|{{ PHPLDAPADMIN_CONFIG_BLOWFISH }}|${salt}|g" /var/www/phpldapadmin/config/config.php
+    sed -i --follow-symlinks "s|{{ PHPLDAPADMIN_CONFIG_BLOWFISH }}|${salt}|g" /var/www/phpldapadmin/config/config.php
 
     append_to_servers() {
       TO_APPEND=$1
-      sed -i "s|{{ PHPLDAPADMIN_SERVERS }}|${TO_APPEND}\n{{ PHPLDAPADMIN_SERVERS }}|g" /var/www/phpldapadmin/config/config.php
+      sed -i --follow-symlinks "s|{{ PHPLDAPADMIN_SERVERS }}|${TO_APPEND}\n{{ PHPLDAPADMIN_SERVERS }}|g" /var/www/phpldapadmin/config/config.php
     }
 
     print_by_php_type() {
@@ -127,7 +127,7 @@ if [ ! -e "$FIRST_START_DONE" ]; then
       fi
     done
 
-    sed -i "/{{ PHPLDAPADMIN_SERVERS }}/d" /var/www/phpldapadmin/config/config.php
+    sed -i --follow-symlinks "/{{ PHPLDAPADMIN_SERVERS }}/d" /var/www/phpldapadmin/config/config.php
 
   fi
 

image/service/phpldapadmin/install.sh

@@ -20,7 +20,7 @@ rm -rf /var/www/phpldapadmin_bootstrap/doc
 
 # apply php5.5 patch
 patch -p1 -d /var/www/phpldapadmin_bootstrap < /container/service/phpldapadmin/assets/php5.5.patch
-sed -i "s/password_hash/password_hash_custom/g" /var/www/phpldapadmin_bootstrap/lib/TemplateRender.php
+sed -i --follow-symlinks "s/password_hash/password_hash_custom/g" /var/www/phpldapadmin_bootstrap/lib/TemplateRender.php
 
 # fix php5-fpm $_SERVER['SCRIPT_NAME'] bad value with cgi.fix_pathinfo=0
-sed -i "s/'SCRIPT_NAME'/'PATH_INFO'/g" /var/www/phpldapadmin_bootstrap/lib/common.php
+sed -i --follow-symlinks "s/'SCRIPT_NAME'/'PATH_INFO'/g" /var/www/phpldapadmin_bootstrap/lib/common.php