Merge branch 'hotfix-0.6.12' into stable

BertrandGouny · BertrandGouny · commit 1eabb92b7e48 · 2017-03-27T17:24:20.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 0.6.12
   - Fixes Parse error: syntax error, unexpected '}' in /container/service/phpldapadmin/assets/config.php on line 68 #23
-  - Upgrade baseimage: web-baseimage:0.1.12
+  - Upgrade baseimage: web-baseimage:1.0.0
 
 ## 0.6.11
   - Upgrade baseimage: web-baseimage:0.1.10
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/web-baseimage:0.1.12
+FROM osixia/web-baseimage:1.0.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # phpLDAPadmin version

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/web-baseimage:0.1.12`
	`1`	`+FROM osixia/web-baseimage:1.0.0`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# phpLDAPadmin version`