From d5cf1d435bae9ffd4d7e808f4bbb9a60bee9b4c0 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 19 Apr 2023 21:59:53 +0200 Subject: [PATCH] [bitnami/codeigniter] Release 4.3.3-debian-11-r7 (#30886) Signed-off-by: Bitnami Containers --- bitnami/codeigniter/4/debian-11/Dockerfile | 7 +- .../opt/bitnami/.bitnami_components.json | 6 -- .../prebuildfs/opt/bitnami/scripts/libos.sh | 95 +++++++++++++++++++ .../opt/bitnami/scripts/libmysqlclient.sh | 6 +- 4 files changed, 101 insertions(+), 13 deletions(-) diff --git a/bitnami/codeigniter/4/debian-11/Dockerfile b/bitnami/codeigniter/4/debian-11/Dockerfile index a0a841263c27..6effb536aab5 100644 --- a/bitnami/codeigniter/4/debian-11/Dockerfile +++ b/bitnami/codeigniter/4/debian-11/Dockerfile @@ -3,10 +3,10 @@ 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-16T16:27:33Z" \ + org.opencontainers.image.created="2023-04-19T19:39:05Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.3.3-debian-11-r6" \ + org.opencontainers.image.ref.name="4.3.3-debian-11-r7" \ org.opencontainers.image.title="codeigniter" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.3.3" @@ -23,7 +23,6 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ COMPONENTS=( \ "php-8.1.18-0-linux-${OS_ARCH}-debian-11" \ "mysql-client-10.6.12-4-linux-${OS_ARCH}-debian-11" \ - "gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \ "codeigniter-4.3.3-2-linux-${OS_ARCH}-debian-11" \ ) && \ for COMPONENT in "${COMPONENTS[@]}"; do \ @@ -45,7 +44,7 @@ RUN /opt/bitnami/scripts/mysql-client/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh ENV APP_VERSION="4.3.3" \ BITNAMI_APP_NAME="codeigniter" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/codeigniter/bin:$PATH" \ + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/mysql/bin:/opt/bitnami/codeigniter/bin:$PATH" \ PHP_ENABLE_OPCACHE="0" EXPOSE 8000 diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index 73539cb0038b..4d720314da5c 100644 --- a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -5,12 +5,6 @@ "type": "NAMI", "version": "4.3.3-2" }, - "gosu": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.16.0-5" - }, "mysql-client": { "arch": "amd64", "distro": "debian-11", diff --git a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 5e141d4ce3f1..e573899abacb 100644 --- a/bitnami/codeigniter/4/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/codeigniter/4/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/codeigniter/4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/codeigniter/4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh index f63dea741844..c8bc278d0266 100644 --- a/bitnami/codeigniter/4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh +++ b/bitnami/codeigniter/4/debian-11/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -447,7 +447,7 @@ mysql_stop() { mysql_install_db() { local command="${DB_BIN_DIR}/mysql_install_db" local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}") - + # Add flags specified via the 'DB_EXTRA_FLAGS' environment variable read -r -a db_extra_flags <<< "$(mysql_extra_flags)" [[ "${#db_extra_flags[@]}" -gt 0 ]] && args+=("${db_extra_flags[@]}") @@ -586,9 +586,9 @@ mysql_ensure_user_exists() { auth_string="identified via pam using '$DB_FLAVOR'" elif [[ -n "$password" ]]; then if [[ -n "$auth_plugin" ]]; then - auth_string="identified with $auth_plugin by \"$password\"" + auth_string="identified with $auth_plugin by '$password'" else - auth_string="identified by \"$password\"" + auth_string="identified by '$password'" fi fi debug "creating database user \'$user\'"