From 789e70ab05ab4a3caf5de4034f43cf6d15cbc34c Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 21 Apr 2023 13:36:49 +0200 Subject: [PATCH] [bitnami/openldap] Release 2.6.4-debian-11-r19 (#31177) Signed-off-by: Bitnami Containers --- bitnami/openldap/2.6/debian-11/Dockerfile | 10 +- .../opt/bitnami/.bitnami_components.json | 6 -- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libopenldap.sh | 2 +- 4 files changed, 101 insertions(+), 12 deletions(-) diff --git a/bitnami/openldap/2.6/debian-11/Dockerfile b/bitnami/openldap/2.6/debian-11/Dockerfile index 788a4744dc14..591ab99240e7 100644 --- a/bitnami/openldap/2.6/debian-11/Dockerfile +++ b/bitnami/openldap/2.6/debian-11/Dockerfile @@ -2,11 +2,12 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-04-18T10:38:05Z" \ +LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \ + org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ + org.opencontainers.image.created="2023-04-21T11:19:16Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.6.4-debian-11-r18" \ + org.opencontainers.image.ref.name="2.6.4-debian-11-r19" \ org.opencontainers.image.title="openldap" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.6.4" @@ -23,7 +24,6 @@ RUN install_packages ca-certificates curl libargon2-1 libcom-err2 libcrypt1 libg RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "openldap-2.6.4-2-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -43,7 +43,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/openldap/postunpack.sh ENV APP_VERSION="2.6.4" \ BITNAMI_APP_NAME="openldap" \ - PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:/opt/bitnami/common/bin:$PATH" + PATH="/opt/bitnami/openldap/bin:/opt/bitnami/openldap/sbin:$PATH" EXPOSE 1389 1636 diff --git a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e452df7dbfcc..1e081dca684d 100644 --- a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -1,10 +1,4 @@ { - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "openldap": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/openldap/2.6/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -553,3 +553,98 @@ get_root_disk_device_id() { get_root_disk_size() { fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true } + +######################## +# Run command as a specific user and group (optional) +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +run_as_user() { + run_chroot "$@" +} + +######################## +# Execute command as a specific user and group (optional), +# replacing the current process image +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Returns: +# Exit code of the specified command +######################### +exec_as_user() { + run_chroot --replace-process "$@" +} + +######################## +# Run a command using chroot +# Arguments: +# $1 - USER(:GROUP) to switch to +# $2..$n - command to execute +# Flags: +# -r | --replace-process - Replace the current process image (optional) +# Returns: +# Exit code of the specified command +######################### +run_chroot() { + local userspec + local user + local homedir + local replace=false + local -r cwd="$(pwd)" + + # Parse and validate flags + while [[ "$#" -gt 0 ]]; do + case "$1" in + -r | --replace-process) + replace=true + ;; + --) + shift + break + ;; + -*) + stderr_print "unrecognized flag $1" + return 1 + ;; + *) + break + ;; + esac + shift + done + + # Parse and validate arguments + if [[ "$#" -lt 2 ]]; then + echo "expected at least 2 arguments" + return 1 + else + userspec=$1 + shift + + # userspec can optionally include the group, so we parse the user + user=$(echo "$userspec" | cut -d':' -f1) + fi + + if ! am_i_root; then + error "Could not switch to '${userspec}': Operation not permitted" + return 1 + fi + + # Get the HOME directory for the user to switch, as chroot does + # not properly update this env and some scripts rely on it + homedir=$(eval echo "~${user}") + if [[ ! -d $homedir ]]; then + homedir="${HOME:-/}" + fi + + # Obtaining value for "$@" indirectly in order to properly support shell parameter expansion + if [[ "$replace" = true ]]; then + exec chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + else + chroot --userspec="$userspec" / bash -c "cd ${cwd}; export HOME=${homedir}; exec \"\$@\"" -- "$@" + fi +} \ No newline at end of file diff --git a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh index 7f769ec9e488..4377b897ceb1 100644 --- a/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh +++ b/bitnami/openldap/2.6/debian-11/rootfs/opt/bitnami/scripts/libopenldap.sh @@ -329,7 +329,7 @@ ldap_create_online_configuration() { ! am_i_root && replace_in_file "${LDAP_SHARE_DIR}/slapd.ldif" "uidNumber=0" "uidNumber=$(id -u)" local -a flags=(-F "$LDAP_ONLINE_CONF_DIR" -n 0 -l "${LDAP_SHARE_DIR}/slapd.ldif") if am_i_root; then - debug_execute gosu "$LDAP_DAEMON_USER" slapadd "${flags[@]}" + debug_execute run_as_user "$LDAP_DAEMON_USER" slapadd "${flags[@]}" else debug_execute slapadd "${flags[@]}" fi