Merge branch 'hotfix-0.9.2' into stable

close #1
[twgit] Init hotfix 'hotfix-0.9.2'.
2014-12-30 17:01:24 +01:00 · 2014-12-30 16:47:28 +01:00 · 2014-12-30 16:41:39 +01:00 · 2014-07-17 10:37:55 +02:00 · 2014-07-17 10:37:49 +02:00 · 2014-07-17 10:25:10 +02:00
3 changed files with 5 additions and 6 deletions
@@ -1,4 +1,4 @@
-FROM osixia/baseimage:0.5.0
+FROM osixia/baseimage:0.6.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
 # From Nick Stenning's work
@@ -27,7 +27,7 @@ CMD ["/sbin/my_init"]
 RUN apt-get -y update
 # Install openldap (slapd) and ldap-utils
-RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y slapd ldap-utils openssl
+RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends slapd ldap-utils openssl
 # Expose ldap default port
 EXPOSE 389
@@ -1,5 +1,5 @@
 NAME = osixia/openldap
-VERSION = 0.9.0
+VERSION = 0.9.2
 .PHONY: all build test tag_latest release
@@ -85,6 +85,5 @@ fi
 status "starting slapd on default port 389"
 set -x
-#with debug:
+
-#exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
+exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap -d -1
 exec /usr/sbin/slapd -h "ldap:///" -u openldap -g openldap
Author	SHA1	Message	Date
osixia	9964ef4491	Merge branch 'hotfix-0.9.2' into stable	2014-12-30 17:01:24 +01:00
osixia	c0aef5c88e	close #1	2014-12-30 16:47:28 +01:00
osixia	a377d17e5a	[twgit] Init hotfix 'hotfix-0.9.2'.	2014-12-30 16:41:39 +01:00
Bertrand Gouny	7eae1e4547	Merge branch 'hotfix-0.9.1' into stable	2014-07-17 10:37:55 +02:00
Bertrand Gouny	17a6c73799	version	2014-07-17 10:37:49 +02:00
Bertrand Gouny	b7459175e1	[twgit] Init hotfix 'hotfix-0.9.1'.	2014-07-17 10:25:10 +02:00