Merge branch 'hotfix-0.7.4' into stable

delete image
use osixia/baseimage:0.4.0
2014-06-19 15:52:22 +02:00 · 2014-06-19 14:55:02 +02:00 · 2014-06-19 14:50:06 +02:00 · 2014-06-19 14:49:15 +02:00 · 2014-06-19 13:50:48 +02:00 · 2014-06-18 23:03:01 +02:00
3 changed files with 7 additions and 5 deletions
@@ -1,4 +1,4 @@
-FROM osixia/baseimage
+FROM osixia/baseimage:0.4.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>

 # From Nick Stenning's work
@@ -18,7 +18,7 @@ ENV LDAP_DOMAIN example.com
 # RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh

 # Enable dnsmasq
-RUN /etc/enable-service dnsmasq
+RUN /sbin/enable-service dnsmasq

 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
@@ -47,7 +47,7 @@ if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
  status "Custom config"

  slapd -h "ldapi:///" -u openldap -g openldap 
-  chown -R openldap:openldap /etc/ldap
+  chown -R openldap:openldap /etc/ldap 

  # TLS
  if [ -e /etc/ldap/ssl/ldap.crt ] && [ -e /etc/ldap/ssl/ldap.key ] && [ -e /etc/ldap/ssl/ca.crt ]; then
@@ -85,4 +85,6 @@ fi

 status "starting slapd on default port 389"
 set -x
-exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+#with debug:
+#exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap 
@@ -6,5 +6,5 @@
 res=$(docker.io images | grep -c "$testImage")

 if [ $res -ne 0 ]; then
-  #docker.io rmi $testImage
+  docker.io rmi $testImage
 fi
Author	SHA1	Message	Date
Bertrand Gouny	0a1e79690e	Merge branch 'hotfix-0.7.4' into stable	2014-06-19 15:52:22 +02:00
Bertrand Gouny	378207027a	delete image	2014-06-19 14:55:02 +02:00
Bertrand Gouny	d245c07803	use osixia/baseimage:0.4.0	2014-06-19 14:50:06 +02:00
Bertrand Gouny	6849077ee8	[twgit] Init hotfix 'hotfix-0.7.4'.	2014-06-19 14:49:15 +02:00
Bertrand Gouny	35904aa284	Merge branch 'hotfix-0.7.3' into stable	2014-06-19 13:50:48 +02:00
Bertrand Gouny	3ae806c51f	retour utilisateur openldap	2014-06-18 23:03:01 +02:00
Bertrand Gouny	1e2512c998	[twgit] Init hotfix 'hotfix-0.7.3'.	2014-06-18 23:02:30 +02:00
Bertrand Gouny	9531804222	Merge branch 'hotfix-0.7.2' into stable	2014-06-18 17:29:34 +02:00
Bertrand Gouny	faeb220686	pb droits	2014-06-18 17:29:25 +02:00
Bertrand Gouny	987d044727	[twgit] Init hotfix 'hotfix-0.7.2'.	2014-06-18 17:28:24 +02:00
Bertrand Gouny	ba0b83ad27	Merge branch 'hotfix-0.7.1' into stable	2014-06-18 17:12:31 +02:00
Bertrand Gouny	ccaf1cf6bc	correction utilisateur slapd deamon	2014-06-18 17:12:22 +02:00
Bertrand Gouny	e303d10740	[twgit] Init hotfix 'hotfix-0.7.1'.	2014-06-18 17:07:08 +02:00