new baseimage

Makefile

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

README.md

@@ -124,8 +124,8 @@ Create the second ldap server, save the container id in LDAP2_CID and get its IP
 Add the pair "ip hostname" to /etc/hosts on each containers,
 beacause ldap.example.org and ldap2.example.org are fake hostnames
 
-	docker exec $LDAP_CID /osixia/test/add-host.sh $LDAP2_IP ldap2.example.org
-	docker exec $LDAP2_CID /osixia/test/add-host.sh $LDAP_IP ldap.example.org
+	docker exec $LDAP_CID /osixia/service/slapd/assets/test/add-host.sh $LDAP2_IP ldap2.example.org
+	docker exec $LDAP2_CID /osixia/service/slapd/assets/test/add-host.sh $LDAP_IP ldap.example.org
 
 We reload slapd to let him take into consideration /etc/hosts changes
 
@@ -136,7 +136,7 @@ That's it ! But a litle test to be sure :
 
 Add a new user "billy" on the first ldap server
 
-	docker exec $LDAP_CID ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /osixia/test/new-user.ldif -h ldap.example.org -ZZ
+	docker exec $LDAP_CID ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /osixia/service/slapd/assets/test/new-user.ldif -h ldap.example.org -ZZ
 
 Search on the second ldap server, and billy should show up !
 

image/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get -y update && /sbin/install-service-available ssl-helper-gnutls \
 	&& rm -rf /var/lib/ldap /etc/ldap/slapd.d
 
 # Add service directory to /osixia
-ADD service /osixia
+ADD service /osixia/service
 
 # Use baseimage install-service script and clean all
 RUN ./sbin/install-service && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

test/test.bats

@@ -69,8 +69,8 @@ load test_helper
   run_image -h ldap.example.org -e USE_REPLICATION=true
 
   # add route to hosts
-  docker exec $LDAP_REPL_CID /osixia/test/add-host.sh $CONTAINER_IP ldap.example.org
-  docker exec $CONTAINER_ID /osixia/test/add-host.sh $LDAP_REPL_IP ldap2.example.org
+  docker exec $LDAP_REPL_CID /osixia/service/slapd/assets/test/add-host.sh $CONTAINER_IP ldap.example.org
+  docker exec $CONTAINER_ID /osixia/service/slapd/assets/test/add-host.sh $LDAP_REPL_IP ldap2.example.org
 
   # wait services on both servers
   wait_service slapd
@@ -85,7 +85,7 @@ load test_helper
   wait_service_by_cid $LDAP_REPL_CID slapd
 
   # add user on ldap2.example.org
-  docker exec $LDAP_REPL_CID ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /osixia/test/new-user.ldif -h ldap2.example.org -ZZ
+  docker exec $LDAP_REPL_CID ldapadd -x -D "cn=admin,dc=example,dc=org" -w admin -f /osixia/service/slapd/assets/test/new-user.ldif -h ldap2.example.org -ZZ
 
   sleep 5