From cda21b88dedf81f1205e14bf4486293ffd3e1433 Mon Sep 17 00:00:00 2001 From: ofreax Date: Fri, 18 Mar 2016 10:15:09 +0100 Subject: [PATCH] update status --- CHANGELOG.md | 3 ++ Makefile | 2 +- README.md | 40 +++++++++---------- example/extend-osixia-openldap/Dockerfile | 2 +- example/kubernetes/simple/ldap-rc.yaml | 2 +- example/kubernetes/using-secrets/ldap-rc.yaml | 2 +- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74d32a6..347dc08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 1.1.2 +Merge pull request Honor LDAP_LOG_LEVEL on startup #39 + ## 1.1.1 Update to light-baseimage:0.2.2 diff --git a/Makefile b/Makefile index 6072a51..75c5ab1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = osixia/openldap -VERSION = 1.1.1 +VERSION = 1.1.2 .PHONY: all build build-nocache test tag_latest release diff --git a/README.md b/README.md index d6aed50..ba359e0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [hub]: https://hub.docker.com/r/osixia/openldap/ -Latest release: 1.1.1 - OpenLDAP 2.4.40 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/)  +Latest release: 1.1.2 - OpenLDAP 2.4.40 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/openldap/)  A docker image to run OpenLDAP. @@ -37,7 +37,7 @@ A docker image to run OpenLDAP. - [Link environment file](#link-environment-file) - [Make your own image or extend this image](#make-your-own-image-or-extend-this-image) - [Advanced User Guide](#advanced-user-guide) - - [Extend osixia/openldap:1.1.1 image](#extend-osixiaopenldap111-image) + - [Extend osixia/openldap:1.1.2 image](#extend-osixiaopenldap112-image) - [Make your own openldap image](#make-your-own-openldap-image) - [Tests](#tests) - [Kubernetes](#kubernetes) @@ -55,7 +55,7 @@ If you find this image useful here's how you can help: ## Quick Start Run OpenLDAP docker image: - docker run --name my-openldap-container --detach osixia/openldap:1.1.1 + docker run --name my-openldap-container --detach osixia/openldap:1.1.2 This start a new container with OpenLDAP running inside. Let's make the first search in our LDAP container: @@ -91,7 +91,7 @@ It will create an empty ldap for the company **Example Inc.** and the domain **e By default the admin has the password **admin**. All those default settings can be changed at the docker command line, for example: docker run --env LDAP_ORGANISATION="My Company" --env LDAP_DOMAIN="my-company.com" \ - --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.1 + --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.2 #### Data persistence @@ -115,7 +115,7 @@ simply mount this directories as a volume to `/var/lib/ldap` and `/etc/ldap/slap docker run --volume /data/slapd/database:/var/lib/ldap \ --volume /data/slapd/config:/etc/ldap/slapd.d - --detach osixia/openldap:1.1.1 + --detach osixia/openldap:1.1.2 You can also use data volume containers. Please refer to: > [https://docs.docker.com/userguide/dockervolumes/](https://docs.docker.com/userguide/dockervolumes/) @@ -133,7 +133,7 @@ If you are looking for a simple solution to administrate your ldap server you ca #### Use auto-generated certificate By default TLS is enable, a certificate is created with the container hostname (it can be set by docker run --hostname option eg: ldap.example.org). - docker run --hostname ldap.my-company.com --detach osixia/openldap:1.1.1 + docker run --hostname ldap.my-company.com --detach osixia/openldap:1.1.2 #### Use your own certificate @@ -143,24 +143,24 @@ You can set your custom certificate at run time, by mounting a directory contain --env LDAP_TLS_CRT_FILENAME=my-ldap.crt \ --env LDAP_TLS_KEY_FILENAME=my-ldap.key \ --env LDAP_TLS_CA_CRT_FILENAME=the-ca.crt \ - --detach osixia/openldap:1.1.1 + --detach osixia/openldap:1.1.2 Other solutions are available please refer to the [Advanced User Guide](#advanced-user-guide) #### Disable TLS Add --env LDAP_TLS=false to the run command: - docker run --env LDAP_TLS=false --detach osixia/openldap:1.1.1 + docker run --env LDAP_TLS=false --detach osixia/openldap:1.1.2 ### Multi master replication Quick example, with the default config. #Create the first ldap server, save the container id in LDAP_CID and get its IP: - LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.1) + LDAP_CID=$(docker run --hostname ldap.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.2) LDAP_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP_CID) #Create the second ldap server, save the container id in LDAP2_CID and get its IP: - LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.1) + LDAP2_CID=$(docker run --hostname ldap2.example.org --env LDAP_REPLICATION=true --detach osixia/openldap:1.1.2) LDAP2_IP=$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" $LDAP2_CID) #Add the pair "ip hostname" to /etc/hosts on each containers, @@ -196,7 +196,7 @@ You may have some problems with mounted files on some systems. The startup scrip To fix that run the container with `--copy-service` argument : - docker run [your options] osixia/openldap:1.1.1 --copy-service + docker run [your options] osixia/openldap:1.1.2 --copy-service ### Debug @@ -205,11 +205,11 @@ Available levels are: `none`, `error`, `warning`, `info`, `debug` and `trace`. Example command to run the container in `debug` mode: - docker run --detach osixia/openldap:1.1.1 --loglevel debug + docker run --detach osixia/openldap:1.1.2 --loglevel debug See all command line options: - docker run osixia/openldap:1.1.1 --help + docker run osixia/openldap:1.1.2 --help ## Environment Variables @@ -267,7 +267,7 @@ Replication options: If you want to set this variable at docker run command add the tag `#PYTHON2BASH:` and convert the yaml in python: - docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.1.1 + docker run --env LDAP_REPLICATION_HOSTS="#PYTHON2BASH:['ldap://ldap.example.org','ldap://ldap2.example.org']" --detach osixia/openldap:1.1.2 To convert yaml to python online: http://yaml-online-parser.appspot.com/ @@ -282,7 +282,7 @@ Other environment variables: Environment variables can be set by adding the --env argument in the command line, for example: docker run --env LDAP_ORGANISATION="My company" --env LDAP_DOMAIN="my-company.com" \ - --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.1 + --env LDAP_ADMIN_PASSWORD="JonSn0w" --detach osixia/openldap:1.1.2 Be aware that environment variable added in command line will be available at any time in the container. In this example if someone manage to open a terminal in this container @@ -293,14 +293,14 @@ he will be able to read the admin password in clear text from environment variab For example if your environment files **my-env.yaml** and **my-env.yaml.startup** are in /data/ldap/environment docker run --volume /data/ldap/environment:/container/environment/01-custom \ - --detach osixia/openldap:1.1.1 + --detach osixia/openldap:1.1.2 Take care to link your environment files folder to `/container/environment/XX-somedir` (with XX < 99 so they will be processed before default environment files) and not directly to `/container/environment` because this directory contains predefined baseimage environment files to fix container environment (INITRD, LANG, LANGUAGE and LC_CTYPE). Note: the container will try to delete the **\*.yaml.startup** file after the end of startup files so the file will also be deleted on the docker host. To prevent that : use --volume /data/ldap/environment:/container/environment/01-custom**:ro** or set all variables in **\*.yaml** file and don't use **\*.yaml.startup**: docker run --volume /data/ldap/environment/my-env.yaml:/container/environment/01-custom/env.yaml \ - --detach osixia/openldap:1.1.1 + --detach osixia/openldap:1.1.2 #### Make your own image or extend this image @@ -308,13 +308,13 @@ This is the best solution if you have a private registry. Please refer to the [A ## Advanced User Guide -### Extend osixia/openldap:1.1.1 image +### Extend osixia/openldap:1.1.2 image If you need to add your custom TLS certificate, bootstrap config or environment files the easiest way is to extends this image. Dockerfile example: - FROM osixia/openldap:1.1.1 + FROM osixia/openldap:1.1.2 MAINTAINER Your Name ADD bootstrap /container/service/slapd/assets/config/bootstrap @@ -333,7 +333,7 @@ Clone this project: Adapt Makefile, set your image NAME and VERSION, for example: NAME = osixia/openldap - VERSION = 1.1.1 + VERSION = 1.1.2 become: NAME = cool-guy/openldap diff --git a/example/extend-osixia-openldap/Dockerfile b/example/extend-osixia-openldap/Dockerfile index cc38837..217ed06 100644 --- a/example/extend-osixia-openldap/Dockerfile +++ b/example/extend-osixia-openldap/Dockerfile @@ -1,4 +1,4 @@ -FROM osixia/openldap:1.1.1 +FROM osixia/openldap:1.1.2 MAINTAINER Your Name ADD bootstrap /container/service/slapd/assets/config/bootstrap diff --git a/example/kubernetes/simple/ldap-rc.yaml b/example/kubernetes/simple/ldap-rc.yaml index fbde88b..e1e7b97 100644 --- a/example/kubernetes/simple/ldap-rc.yaml +++ b/example/kubernetes/simple/ldap-rc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ldap - image: osixia/openldap:1.1.1 + image: osixia/openldap:1.1.2 volumeMounts: - name: ldap-data mountPath: /var/lib/ldap diff --git a/example/kubernetes/using-secrets/ldap-rc.yaml b/example/kubernetes/using-secrets/ldap-rc.yaml index f72d06e..601d9e1 100644 --- a/example/kubernetes/using-secrets/ldap-rc.yaml +++ b/example/kubernetes/using-secrets/ldap-rc.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ldap - image: osixia/openldap:1.1.1 + image: osixia/openldap:1.1.2 command: - --copy-service volumeMounts: