Archived
Merge branch 'release-0.6.0' into stable
This commit is contained in:
commit
08b5a758be
2 files changed
+3
-3
No files matched your search
@@ -15,6 +15,9 @@ ENV LDAP_DOMAIN example.com
|
|||||||
# Disable SSH
|
# Disable SSH
|
||||||
RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
|
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
|
||||||
|
|
||||||
# Use baseimage-docker's init system.
|
# Use baseimage-docker's init system.
|
||||||
CMD ["/sbin/my_init"]
|
CMD ["/sbin/my_init"]
|
||||||
|
|
||||||
|
|||||||
@@ -46,9 +46,6 @@ fi
|
|||||||
if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
|
if [ ! -e /etc/ldap/config/docker_bootstrapped ]; then
|
||||||
status "Custom config"
|
status "Custom config"
|
||||||
|
|
||||||
# permission error on /etc/ldap/slapd.conf if not set?! :'(
|
|
||||||
adduser openldap root
|
|
||||||
|
|
||||||
slapd -h "ldapi:///" -u openldap -g openldap
|
slapd -h "ldapi:///" -u openldap -g openldap
|
||||||
chown -R openldap:openldap /etc/ldap
|
chown -R openldap:openldap /etc/ldap
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user