merge original source rroemhild/docker-test-openldap:master

Author: alexandredevely

Dockerfile

@@ -38,4 +38,9 @@ EXPOSE 10389 10636
 
 CMD ["/init"]
 
-HEALTHCHECK CMD ["ldapsearch", "-H", "ldap://127.0.0.1:10389", "-D", "${LDAP_BINDDN}", "-w", "${LDAP_SECRET}", "-b", "${LDAP_BINDDN}"]
+# Add a healthcheck script
+RUN echo '#!/bin/sh' > /healthcheck.sh && \
+    echo 'ldapsearch -H ldap://127.0.0.1:10389 -D "${LDAP_BINDDN}" -w "${LDAP_SECRET}" -b "${LDAP_BINDDN}" >/dev/null 2>&1 || exit 1' >> /healthcheck.sh && \
+    chmod +x /healthcheck.sh
+
+HEALTHCHECK CMD /healthcheck.sh

README.md

@@ -196,14 +196,14 @@ with dedicated values.
 | gidNumber        | 12044 |
 | homeDirectory    | /home/leela |
 
-### cn=Bender Bending Rodríguez,ou=people,dc=planetexpress,dc=com
+### cn=Bender Bending Rodriguez,ou=people,dc=planetexpress,dc=com
 
 | Attribute        | Value            |
 | ---------------- | ---------------- |
 | objectClass      | inetOrgPerson |
 | objectClass      | posixAccount |
-| cn               | Bender Bending Rodríguez |
-| sn               | Rodríguez |
+| cn               | Bender Bending Rodriguez |
+| sn               | Rodriguez |
 | description      | Robot |
 | employeeType     | Ship's Robot |
 | givenName        | Bender |
@@ -253,7 +253,7 @@ Amy has a multi-valued DN
 | cn               | ship_crew |
 | member           | cn=Turanga Leela,ou=people,dc=planetexpress,dc=com |
 | member           | cn=Philip J. Fry,ou=people,dc=planetexpress,dc=com |
-| member           | cn=Bender Bending Rodríguez,ou=people,dc=planetexpress,dc=com |
+| member           | cn=Bender Bending Rodriguez,ou=people,dc=planetexpress,dc=com |
 
 
 ## JAAS configuration

rootfs/opt/openldap/bootstrap/data/10_people_bender.ldif

@@ -3,7 +3,10 @@ objectClass: inetOrgPerson
 objectClass: organizationalPerson
 objectClass: person
 objectClass: top
+<<<<<<< HEAD
 objectClass: posixAccount
+=======
+>>>>>>> 1c8d1ad738b2378c169d0a2506aa239956b14a68
 cn: Bender Bending Rodriguez
 sn: Rodriguez
 uidNumber: 2046

rootfs/opt/openldap/bootstrap/data/30_groups_crew.ldif

@@ -5,4 +5,4 @@ groupType: 2147483650
 cn: ship_crew
 member: cn=Philip J. Fry,ou=people,dc=planetexpress,dc=com
 member: cn=Turanga Leela,ou=people,dc=planetexpress,dc=com
-member: cn=Bender Bending Rodríguez,ou=people,dc=planetexpress,dc=com
+member: cn=Bender Bending Rodriguez,ou=people,dc=planetexpress,dc=com