Merge branch 'release-0.6.0' into stable

Merge branch 'feature-new-base-image' into release-0.6.0
[twgit] Init release 'release-0.6.0'.
2014-05-08 17:54:43 +02:00 · 2014-05-08 17:54:31 +02:00 · 2014-05-08 17:54:05 +02:00 · 2014-05-08 17:53:41 +02:00 · 2014-05-07 23:25:52 +02:00
2 changed files with 3 additions and 3 deletions
@@ -15,6 +15,9 @@ ENV LDAP_DOMAIN example.com
 # Disable SSH
 RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh

+# DIsable nginx and php
+RUN rm -rf /etc/service/nginx /etc/service/php5-fpm
+
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]

@@ -46,9 +46,6 @@ fi
 if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
  status "Custom config"

-  # permission error on /etc/ldap/slapd.conf if not set?! :'(
-  adduser openldap root
-
  slapd -h "ldapi:///" -u openldap -g openldap 
  chown -R openldap:openldap /etc/ldap
Author	SHA1	Message	Date
Bertrand Gouny	08b5a758be	Merge branch 'release-0.6.0' into stable	2014-05-08 17:54:43 +02:00
Bertrand Gouny	38e78710af	Merge branch 'feature-new-base-image' into release-0.6.0	2014-05-08 17:54:31 +02:00
Bertrand Gouny	e3588f93f2	[twgit] Init release 'release-0.6.0'.	2014-05-08 17:54:05 +02:00
Bertrand Gouny	d7245df8bb	osixia base	2014-05-08 17:53:41 +02:00
Bertrand Gouny	60293c62cb	[twgit] Init feature 'feature-new-base-image'.	2014-05-07 23:25:52 +02:00