Merge branch 'hotfix-0.9.1' into stable

This commit is contained in:
Bertrand Gouny committed 2014-07-17 10:37:55 +02:00
commit 7eae1e4547
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -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 -1
View File
@@ -1,5 +1,5 @@
NAME = osixia/openldap
VERSION = 0.9.0
VERSION = 0.9.1
.PHONY: all build test tag_latest release