Update Version and Readme and TODO

Fekide · Sep 18, 2019 · f50922f · f50922f
1 parent 335f87d
commit f50922f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git 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
@@ -1,13 +1,13 @@
 FROM osixia/openldap:1.1.9
 LABEL maintainer="[email protected]" \
-      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
@@ -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
@@ -0,0 +1,3 @@
+Additions:
+	☐ Use sympa plugin
+	☐ Use SOGo plugin