diff --git a/README.md b/README.md index b6e3f65..9801996 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ # vegardit/openldap What is it? -Opinionated docker image is currently based on the [Debian](https://www.debian.org/) docker image [`debian:bullseye-slim`](https://hub.docker.com/_/debian?tab=tags&name=bullseye-slim) to run an [OpenLDAP 2.4](https://www.openldap.org/doc/admin24/) server. +Opinionated docker image is currently based on the [Debian](https://www.debian.org/) docker image [`debian:bookworm-slim`](https://hub.docker.com/_/debian?tab=tags&name=bookworm-slim) to run an [OpenLDAP 2.5](https://www.openldap.org/doc/admin25/) server. It is automatically built **daily** to include the latest OS security fixes. @@ -217,7 +217,7 @@ ### Troubleshooting ## References -- OpenLDAP Software 2.4 Administrator's Guide https://www.openldap.org/doc/admin24/guide.html +- OpenLDAP Software 2.5 Administrator's Guide https://www.openldap.org/doc/admin25/guide.html - OpenLDAP Online Configuration Reference https://tylersguides.com/guides/openldap-online-configuration-reference/ - slapd-config(5) - Linux man page https://linux.die.net/man/5/slapd-config diff --git a/build-image.sh b/build-image.sh index 592d293..d0af70b 100644 --- a/build-image.sh +++ b/build-image.sh @@ -18,7 +18,7 @@ source "$shared_lib/lib/build-image-init.sh" # specify target repo and image name ################################################# image_repo=${DOCKER_IMAGE_REPO:-vegardit/openldap} -base_image_name=${DOCKER_BASE_IMAGE:-debian:bullseye-slim} +base_image_name=${DOCKER_BASE_IMAGE:-debian:bookworm-slim} base_image_tag=${base_image_name#*:} image_name=$image_repo:latest @@ -63,8 +63,8 @@ echo "ldap_version=$ldap_version" ################################################# declare -a tags=() tags+=($image_name) # :latest -tags+=($image_repo:${ldap_version}) # :2.4.47 -tags+=($image_repo:${ldap_version%.*}.x) # :2.4.x +tags+=($image_repo:${ldap_version}) # :2.5.12 +tags+=($image_repo:${ldap_version%.*}.x) # :2.5.x tags+=($image_repo:${ldap_version%%.*}.x) # :2.x for tag in ${tags[@]}; do diff --git a/image/Dockerfile b/image/Dockerfile index 356f2c2..1d3dc07 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -8,8 +8,8 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/docker-openldap -# https://hub.docker.com/_/debian?tab=tags&name=bullseye-slim -ARG BASE_IMAGE=debian:bullseye-slim +# https://hub.docker.com/_/debian?tab=tags&name=bookworm-slim +ARG BASE_IMAGE=debian:bookworm-slim # see https://github.com/hadolint/hadolint/wiki/DL3006 # hadolint ignore=DL3006 diff --git a/image/run.sh b/image/run.sh index 191f05a..1f46669 100644 --- a/image/run.sh +++ b/image/run.sh @@ -123,7 +123,6 @@ if [ ! -e /etc/ldap/slapd.d/initialized ]; then ldif add -Y EXTERNAL /opt/ldifs/schema_rfc2307bis02.ldif fi - ldif add -Y EXTERNAL /etc/ldap/schema/ppolicy.ldif ldif add -Y EXTERNAL /opt/ldifs/schema_sudo.ldif ldif add -Y EXTERNAL /opt/ldifs/schema_ldapPublicKey.ldif