From f50922f6a8df7707d982195b4dc6dd59e71092bf Mon Sep 17 00:00:00 2001 From: Felix Haase Date: Wed, 18 Sep 2019 22:46:34 +0200 Subject: [PATCH] Update Version and Readme and TODO --- .travis.yml | 2 +- Dockerfile | 10 +++++----- README.md | 10 ++++++++++ TODO | 3 +++ 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 TODO diff --git a/.travis.yml b/.travis.yml index 63609f5..831e3c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: env: global: - - DOCKER_VERSION=17.06.0~ce-0~ubuntu + - DOCKER_VERSION=18.06.3~ce~3-0~ubuntu before_install: - apt-cache madison docker-ce diff --git a/Dockerfile b/Dockerfile index a4117dd..dec02e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM osixia/openldap:1.1.9 LABEL maintainer="it@feki.de" \ - version="1.1.9-1.2-1" + version="1.1.9-1.3-1" -ENV FUSIONDIRECTORY_VERSION=1.2-1 +ENV FUSIONDIRECTORY_VERSION=1.3-1 RUN apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys D744D55EACDA69FF \ - && (echo "deb http://repos.fusiondirectory.org/fusiondirectory-current/debian-jessie jessie main"; \ - echo "deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-jessie jessie main") \ - > /etc/apt/sources.list.d/fusiondirectory-jessie.list \ + && (echo "deb http://repos.fusiondirectory.org/fusiondirectory-current/debian-stretch stretch main"; \ + echo "deb http://repos.fusiondirectory.org/fusiondirectory-extra/debian-stretch stretch main") \ + > /etc/apt/sources.list.d/fusiondirectory-stretch.list \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ fusiondirectory-schema=${FUSIONDIRECTORY_VERSION} \ diff --git a/README.md b/README.md index 4cc4ff2..fcc8f8f 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,16 @@ docker run --name ldap -p 389:389 \ -d hrektts/fusiondirectory-openldap:latest ``` +## Environment Variables + +| Variable | Function | default | +| :-----------------: | --------------------------------------------------------- | ------------: | +| LDAP_ORGANISATION | Name of your Organisation | Example Inc. | +| LDAP_DOMAIN | Domain of your Organisation | example.org | +| LDAP_ADMIN_PASSWORD | Password for the LDAP Admin (cn=admin,dc=example,dc=org) | admin | +| FD_ADMIN_PASSWORD | Password for the FusionDirectory Admin (fd-admin) | adminpassword | + ## References +More Environment variables and information here: [osixia/docker-openldap](https://github.com/osixia/docker-openldap) diff --git a/TODO b/TODO new file mode 100644 index 0000000..03ba221 --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +Additions: + ☐ Use sympa plugin + ☐ Use SOGo plugin