Merge branch 'hotfix-0.6.12' into stable

osixia · Mar 27, 2017 · 1eabb92 · 1eabb92
2 parents 82777b5 + f3ed7d0
commit 1eabb92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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