starred/container-openldap
1
0
Fork 0
mirror of https://github.com/osixia/container-openldap.git synced 2026-09-25 16:50:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-0.6.1' into stable

Browse Source
This commit is contained in:
Bertrand Gouny
2014-05-09 15:57:15 +02:00
parent 08b5a758be a413a31ed3
commit 676d3d736d
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -2
View File
@@ -15,8 +15,8 @@ ENV LDAP_DOMAIN example.com
# Disable SSH
RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
# DIsable nginx and php
RUN rm -rf /etc/service/nginx /etc/service/php5-fpm
# Enable dnsmasq
RUN /etc/enable-service dnsmasq
# Use baseimage-docker's init system.
CMD ["/sbin/my_init"]
test/db.sh
+2 -1
View File
@@ -17,7 +17,8 @@ $dir/tools/delete-container.sh
runOptions="-v $openldapTestDir/db:/var/lib/ldap -v $openldapTestDir/config:/etc/ldap/slapd.d"
. $dir/tools/run-simple.sh
ldapsearch -x -h localhost -p 65389 -b dc=otherdomain,dc=com
echo "ldapsearch -x -h $IP -b dc=otherdomain,dc=com"
ldapsearch -x -h $IP -b dc=otherdomain,dc=com
rm -r $openldapTestDir
$dir/tools/delete-container.sh
test/simple.sh
+2 -1
View File
@@ -4,6 +4,7 @@ dir=$(dirname $0)
. $dir/tools/config.prop
. $dir/tools/run-simple.sh
ldapsearch -x -h localhost -p 65389 -b dc=example,dc=com
echo "ldapsearch -x -h $IP -b dc=example,dc=com"
ldapsearch -x -h $IP -b dc=example,dc=com
$dir/tools/delete-container.sh
test/tls.sh
+2 -1
View File
@@ -4,6 +4,7 @@ dir=$(dirname $0)
. $dir/tools/config.prop
. $dir/tools/run-tls.sh
ldapsearch -x -h $certCN -p 65389 -b dc=example,dc=com -ZZ
echo "ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ"
ldapsearch -x -h $certCN -b dc=example,dc=com -ZZ
. $dir/tools/end-tls.sh
test/tools/run-simple.sh
+11 -2
View File
@@ -1,5 +1,14 @@
#!/bin/sh
echo "docker.io run --name $openldapTestContainer $runOptions -p 65389:389 -d $openldapTestImage"
docker.io run --name $openldapTestContainer $runOptions -p 65389:389 -d $openldapTestImage
echo "docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage"
ID=`docker.io run --name $openldapTestContainer $runOptions -d $openldapTestImage`
sleep 5
echo " --> Obtaining IP"
IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
if [ "$IP" = "" ]; then
abort "Unable to obtain container IP"
exit 1
else
echo " -->" $IP
fi
test/tools/run-tls.sh
+1 -1
View File
@@ -6,7 +6,7 @@ runOptions="--dns=127.0.0.1 -v `pwd`/test/ssl:/etc/ldap/ssl"
cert=$(echo $dir/ssl/ldap.crt)
certCN=$(openssl x509 -in $cert -subject -noout | sed -n 's/.*CN=\(.*\)\/*\(.*\)/\1/p')
addLine=$(echo "127.0.0.1" $certCN)
addLine=$(echo $IP $certCN)
echo $addLine >> /etc/hosts
cp /etc/ldap/ldap.conf /etc/ldap/ldap.conf.old