From fa6134e7f593324a1b92b6d992cec3d39c38ecfb Mon Sep 17 00:00:00 2001 From: FrozenDragoon Date: Tue, 8 Aug 2017 09:03:51 -0500 Subject: [PATCH] Don't build a new container for ldap, pass the variables via docker-compose. --- example/ldap/Dockerfile | 9 --------- example/ldap/docker-compose.yml | 10 +++++++++- 2 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 example/ldap/Dockerfile diff --git a/example/ldap/Dockerfile b/example/ldap/Dockerfile deleted file mode 100644 index fbb515eba..000000000 --- a/example/ldap/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM clems4ever/openldap - -ENV SLAPD_ORGANISATION=MyCompany -ENV SLAPD_DOMAIN=example.com -ENV SLAPD_PASSWORD=password -ENV SLAPD_CONFIG_PASSWORD=password -ENV SLAPD_ADDITIONAL_MODULES=memberof -ENV SLAPD_ADDITIONAL_SCHEMAS=openldap -ENV SLAPD_FORCE_RECONFIGURE=true diff --git a/example/ldap/docker-compose.yml b/example/ldap/docker-compose.yml index 0f505a0a1..e991df60b 100644 --- a/example/ldap/docker-compose.yml +++ b/example/ldap/docker-compose.yml @@ -1,7 +1,15 @@ version: '2' services: openldap: - build: ./example/ldap + image: clems4ever/openldap + environment: + - SLAPD_ORGANISATION=MyCompany + - SLAPD_DOMAIN=example.com + - SLAPD_PASSWORD=password + - SLAPD_CONFIG_PASSWORD=password + - SLAPD_ADDITIONAL_MODULES=memberof + - SLAPD_ADDITIONAL_SCHEMAS=openldap + - SLAPD_FORCE_RECONFIGURE=true volumes: - ./example/ldap/base.ldif:/etc/ldap.dist/prepopulate/base.ldif - ./example/ldap/access.rules:/etc/ldap.dist/prepopulate/access.rules