upgrade to Debian Bookworm and OpenLDAP 2.5

This commit is contained in:
sebthom 2023-06-23 13:48:06 +02:00
parent f820788a38
commit e7c71ff78b
4 changed files with 7 additions and 8 deletions

View file

@ -22,7 +22,7 @@ # vegardit/openldap <a href="https://github.com/vegardit/docker-openldap/" title
## <a name="what-is-it"></a>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 @@ ### <a name="troubleshooting"></a>Troubleshooting
## <a name="references"></a>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

View file

@ -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

View file

@ -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

View file

@ -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