Page MenuHomePhorge
Files F1974907

No OneTemporary
Actions

View Options

diff --git a/docker/ds389/Dockerfile b/docker/ds389/Dockerfile
index 00686e5c..c3c3d030 100644
--- a/docker/ds389/Dockerfile
+++ b/docker/ds389/Dockerfile
@@ -1,29 +1,31 @@
FROM centos/centos7:latest
MAINTAINER Liutauras Adomaitis <adomaitis@kolabsys.com>
RUN yum install -y epel-release 389-ds-base 389-adminutil gettext \
&& yum update -y \
&& yum clean all
- COPY *.tpl ./
- COPY kolab-schema.ldif 99kolab-schema.ldif
-
- RUN for F in $(ls *.tpl); do eval "echo \"$(cat $F)\"" | tee $(basename $F .tpl); done
-
- RUN useradd ldapadmin \
- && rm -fr /var/lock /usr/lib/systemd/system \
- # No persistent storage
- # && mkdir /srv/dirsrv/{cnf,lib,log} && ln -s /srv/cnf/ /etc/dirsrv/ && ln -s /srv/lib/ /var/lib/dirsrv/ && ln -s /srv/log/ /var/log/dirsrv/ \
- && setup-ds.pl -ddd --silent --file /ds_setup.inf \
- && chown nobody.nobody -R /var/lib/dirsrv/
-
- EXPOSE 389
-
- CMD for B in $(ls /tmp/ds389-load/*_backend.ldif); do \
- ## eval "echo \"$(cat $B)\"" | tee $(basename $B .tpl); \
- /usr/lib64/dirsrv/slapd-${DS_INSTANCE_NAME}/ldif2db -Z ${DS_INSTANCE_NAME} -n $(basename ${B} _backend.ldif) -i ${B}; \
- done \
- && /usr/lib64/dirsrv/slapd-hkccp/start-slapd \
- && tail -F /var/log/dirsrv/slapd-$DS_INSTANCE_NAME/access /var/log/dirsrv/slapd-$DS_INSTANCE_NAME/errors
+COPY *.tpl ./
+COPY kolab-schema.ldif 99kolab-schema.ldif
+
+RUN for F in $(ls *.tpl); do eval "echo \"$(cat $F)\"" | tee $(basename $F .tpl); done
+
+RUN rm -fr /var/lock /usr/lib/systemd/system \
+ # No persistent storage
+ # && mkdir /srv/dirsrv/{cnf,lib,log} && ln -s /srv/cnf/ /etc/dirsrv/ && ln -s /srv/lib/ /var/lib/dirsrv/ && ln -s /srv/log/ /var/log/dirsrv/ \
+ && setup-ds.pl -ddd --silent --file /ds_setup.inf \
+ && chown nobody.nobody -R /var/lib/dirsrv/
+
+COPY *.ldif /var/lib/dirsrv/slapd-${DS_INSTANCE_NAME}/ldif/
+
+EXPOSE 389
+
+CMD for I in $(ls /var/lib/dirsrv/slapd-${DS_INSTANCE_NAME}/ldif/*-import.ldif || true); do \
+ sed -r -i -e 's/mailHost: .*$/mailHost: localhost/g' ${I}; \
+ chmod 644 ${I}; \
+ /usr/lib64/dirsrv/slapd-${DS_INSTANCE_NAME}/ldif2db -Z ${DS_INSTANCE_NAME} -n ${I%%-import.ldif} -i ${I}; \
+ done \
+ && /usr/lib64/dirsrv/slapd-hkccp/start-slapd \
+ && tail -F /var/log/dirsrv/slapd-$DS_INSTANCE_NAME/access /var/log/dirsrv/slapd-$DS_INSTANCE_NAME/errors
diff --git a/docker/kolab/utils/03-setup-kolab.sh b/docker/kolab/utils/03-setup-kolab.sh
index 53efe656..3b604ce1 100755
--- a/docker/kolab/utils/03-setup-kolab.sh
+++ b/docker/kolab/utils/03-setup-kolab.sh
@@ -1,17 +1,34 @@
#!/bin/bash
+. ./settings.sh
+
if [ -f /root/kolab.conf.template ]; then
eval "echo \"$(cat /root/kolab.conf.template)\"" > /root/kolab.conf.ref
KOLAB_CONFIG_REF="--config=/root/kolab.conf.ref"
cp -f ${KOLAB_CONFIG_REF#--config=} /etc/kolab/kolab.conf
fi
-setup-kolab \
+CMD="$(which setup-kolab) \
--default ${LDAP_HOST+--without-ldap} ${KOLAB_CONFIG_REF} \
- --fqdn=kolab.mgmt.com \
+ --fqdn=kolab.${domain} \
--timezone=Europe/Zurich \
--mysqlhost=${DB_HOST:-127.0.0.1} \
--mysqlserver=existing \
--mysqlrootpw=${DB_ROOT_PASSWORD:-Welcome2KolabSystems} \
- --directory-manager-pwd=${LDAP_ADMIN_BIND_PW:-Welcome2KolabSystems} 2>&1 | tee /root/setup-kolab.log
+ --directory-manager-pwd=${LDAP_ADMIN_BIND_PW:-Welcome2KolabSystems}"
+
+echo ${CMD} | tee -a /root/setup-kolab.log
+echo -n "Wait for MariaDB container: " | tee -a /root/setup-kolab.log
+while ! mysqladmin -u root ping > /dev/null 2>&1 ; do
+ echo -n '.'
+ sleep 3
+done | tee -a /root/setup-kolab.log
+echo "OK!" | tee -a /root/setup-kolab.log
+echo -n "Wait for DS389 container: " | tee -a /root/setup-kolab.log
+while ! ldapsearch -h ${LDAP_HOST} -D "${LDAP_ADMIN_BIND_DN}" -w "${LDAP_ADMIN_BIND_PW}" -b "" -s base > /dev/null 2>&1 ; do
+ echo -n '.'
+ sleep 3
+done | tee -a /root/setup-kolab.log
+echo "OK!" | tee -a /root/setup-kolab.log
+${CMD} 2>&1 | tee -a /root/setup-kolab.log

File Metadata

Mime Type
text/x-diff
Expires
Mon, Sep 15, 10:09 AM (1 d, 14 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
287523
Default Alt Text
(3 KB)

Event Timeline