- [docker](src/docker) Now use alpine:3.20 (openldap 2.6.7).

- [docker](README.md) Remove obsolete element `version` in `yml` examples.
- [demo](demo/Makefile) Remove unsused service `dns`.
- [demo](demo/Makefile) Add target `auth-apk_list`.
- [demo](demo/docker-compose.yml) Remove obsolete element `version` in docker-compose.yml.

Author: mlan

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.1.5
+
+- [docker](src/docker) Now use alpine:3.20 (openldap 2.6.7).
+- [docker](README.md) Remove obsolete element `version` in `yml` examples.
+- [demo](demo/Makefile) Remove unsused service `dns`.
+- [demo](demo/Makefile) Add target `auth-apk_list`.
+- [demo](demo/docker-compose.yml) Remove obsolete element `version` in docker-compose.yml.
+
 # 2.1.4
 
 - [docker](src/docker) Now use alpine:3.19 (openldap 2.6.6).

Makefile

@@ -5,7 +5,7 @@
 
 -include    *.mk
 
-BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.19
+BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.20
 BLD_REPO ?= mlan/openldap
 BLD_VER  ?= latest
 BLD_KIT  ?= DOCKER_BUILDKIT=1

README.md

@@ -97,7 +97,7 @@ ldapsearch -H ldap://auth:389/ -b dc=example,dc=com "(&(objectClass=inetOrgPerso
 An example of how to define an OpenLDAP directory service using docker compose is given below. Other services that also use the `backend` network will be able to access the directory service.
 
 ```yaml
-version: '3'
+name: demo
 services:
   auth:
     image: mlan/openldap
@@ -195,7 +195,7 @@ docker run -d --name auth -v auth:/srv mlan/openldap
 Or using [docker compose](https://docs.docker.com/compose/) and a `docker-compose.yml` file
 
 ```yaml
-version: '3'
+name: demo
 services:
   auth:
     image: mlan/openldap
@@ -228,7 +228,7 @@ docker run -d --name auth -v $(pwd)/ldif/0/cfg.example.com.ldif:/etc/openldap/sl
 Similarly using docker compose, both database 0 and 1 can be bind mounted
 
 ```yaml
-version: '3'
+name: demo
 services:
   auth:
     image: mlan/openldap
@@ -240,7 +240,7 @@ services:
 Docker secrets can be used like this
 
 ```yaml
-version: '3'
+name: demo
 services:
   auth:
     image: mlan/openldap
@@ -276,7 +276,7 @@ docker run -d --name auth -e LDAPBASE=dc=sample,dc=org mlan/openldap --root-cn m
 Similarly with docker compose but now using the file `ldif/0/cfg.example.com.ldif` as a template.
 
 ```yaml
-version: '3'
+name: demo
 services:
   auth:
     image: mlan/openldap

demo/Makefile

@@ -11,7 +11,7 @@ AD_DC    ?= $(call ad_cut_dot, 1, 1, $(AD_DOM))
 
 SSL_O     = $(AD_DOM)
 
-SRV_LIST ?= auth dns gui
+SRV_LIST ?= auth gui
 
 NET_ENV  ?= --rm --network=demo_backend
 SSL_ENV  ?= $(NET_ENV) \
@@ -203,3 +203,6 @@ auth-htop: auth-debugtools
 auth-debugtools:
 	docker compose exec auth apk --no-cache --update add \
 	nano less lsof htop bind-tools iputils strace
+
+auth-apk_list:
+	docker compose exec auth /bin/sh -c 'apk info -sq $$(apk info -q) | sed -r "N;N;s/([^ ]+) installed size:\n([^ ]+) (.).*/\2\3\t\1/" | sort -h'

demo/docker-compose.yml

@@ -1,4 +1,5 @@
-version: '3'
+name: demo
+
 services:
   auth:
     image: mlan/openldap