From 420e67670a691059a08fefba50cb4bcc7ed4ab84 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 30 Jun 2019 18:11:36 +0300
Subject: [PATCH] docker-compose modifications.
- Name the slapd service as ldap (in case it's replaced by a different
LDAP server).
- Allow overriding the default environment variables (preparation for an
actual deployment).
---
docker-compose.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 855a240..8fdac63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,23 +2,23 @@
---
version: '3.5'
services:
- slapd:
+ ldap:
build:
context: slapd/
volumes:
- _run_ldap:/run/slapd
- ldap:/var/lib/ldap
environment:
- LDAP_ROOTPASS: foo
- LDAP_DOMAIN: nowhere.com
- LDAP_ORGANIZATION: none
+ LDAP_ROOTPASS: "${LDAP_ROOTPASS:-foo}"
+ LDAP_DOMAIN: "${LDAP_DOMAIN:-nowhere.com}"
+ LDAP_ORGANIZATION: "${LDAP_ORGANIZATION:-none}"
nss-pam-ldapd:
build:
context: nss-pam-ldapd/
command: /usr/sbin/nslcd --debug --nofork
environment:
- LDAP_BASE_DN: 'dc=nowhere,dc=com'
+ LDAP_BASE_DN: "${LDAP_BASE_DN:-dc=nowhere,dc=com}"
volumes:
- _run_ldap:/run/slapd
@@ -26,7 +26,7 @@ services:
build:
context: ldap-account-manager/
links:
- - slapd
+ - ldap
volumes:
- _run_ldap:/run/slapd
- ldap-account-manager:/var/lib/ldap-account-manager
--
GitLab