浏览代码

Merge branch 'hotfix-0.9.1' into stable

Bertrand Gouny 11 年之前
父节点
当前提交
7eae1e4547
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      Dockerfile
  2. 1 1
      Makefile

+ 2 - 2
Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/baseimage:0.5.0
+FROM osixia/baseimage:0.6.0
 MAINTAINER Bertrand Gouny <[email protected]>
 MAINTAINER Bertrand Gouny <[email protected]>
 
 
 # From Nick Stenning's work
 # From Nick Stenning's work
@@ -27,7 +27,7 @@ CMD ["/sbin/my_init"]
 RUN apt-get -y update
 RUN apt-get -y update
 
 
 # Install openldap (slapd) and ldap-utils
 # 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 ldap default port
 EXPOSE 389
 EXPOSE 389

+ 1 - 1
Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/openldap
 NAME = osixia/openldap
-VERSION = 0.9.0
+VERSION = 0.9.1
 
 
 .PHONY: all build test tag_latest release
 .PHONY: all build test tag_latest release