edb/docker-openldap
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix-0.7.4' into stable

Browse Source
This commit is contained in:
Bertrand Gouny committed 2014-06-19 15:52:22 +02:00
2 parents 35904aa284 378207027a
commit 0a1e79690e
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Dockerfile
+2 -2
View File
@@ -1,4 +1,4 @@
FROM osixia/baseimage FROM osixia/baseimage:0.4.0
MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr> MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
# From Nick Stenning's work # 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 # RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
# Enable dnsmasq # Enable dnsmasq
RUN /etc/enable-service dnsmasq RUN /sbin/enable-service dnsmasq
# Use baseimage-docker's init system. # Use baseimage-docker's init system.
CMD ["/sbin/my_init"] CMD ["/sbin/my_init"]
test/tools/delete-image.sh
+1 -1
View File
@@ -6,5 +6,5 @@
res=$(docker.io images | grep -c "$testImage") res=$(docker.io images | grep -c "$testImage")
if [ $res -ne 0 ]; then if [ $res -ne 0 ]; then
#docker.io rmi $testImage docker.io rmi $testImage
fi fi