[bitnami/ghost] Release 5.44.0-debian-11-r2 (#31128)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-04-20 19:40:21 +02:00
committed by GitHub
parent 455efb1f1c
commit c5a54eac3d
6 changed files with 109 additions and 20 deletions

View File

@@ -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-17T15:25:20Z" \
LABEL com.vmware.cp.artifact.flavor="sha256:109c7d51bd69bb6b3df71017440c1ea0699454f81fe188056c083f0b57c96ea6" \
org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
org.opencontainers.image.created="2023-04-20T17:05:53Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="5.44.0-debian-11-r1" \
org.opencontainers.image.ref.name="5.44.0-debian-11-r2" \
org.opencontainers.image.title="ghost" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="5.44.0"
@@ -22,10 +23,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN install_packages acl ca-certificates curl jq libaudit1 libbz2-1.0 libcap-ng0 libcom-err2 libcrypt1 libffi7 libgcc-s1 libgssapi-krb5-2 libicu67 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncurses6 libncursesw6 libnsl2 libpam0g libreadline8 libsqlite3-0 libssl1.1 libstdc++6 libtinfo6 libtirpc3 libxml2 procps zlib1g
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"python-3.8.16-9-linux-${OS_ARCH}-debian-11" \
"python-3.8.16-11-linux-${OS_ARCH}-debian-11" \
"node-16.20.0-1-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" \
"ghost-5.44.0-1-linux-${OS_ARCH}-debian-11" \
) && \
for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -46,7 +46,7 @@ RUN /opt/bitnami/scripts/ghost/postunpack.sh
RUN /opt/bitnami/scripts/mysql-client/postunpack.sh
ENV APP_VERSION="5.44.0" \
BITNAMI_APP_NAME="ghost" \
PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/ghost/bin:$PATH"
PATH="/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/mysql/bin:/opt/bitnami/ghost/bin:$PATH"
EXPOSE 2368 3000

View File

@@ -5,12 +5,6 @@
"type": "NAMI",
"version": "5.44.0-1"
},
"gosu": {
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.16.0-5"
},
"mysql-client": {
"arch": "amd64",
"distro": "debian-11",
@@ -27,6 +21,6 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "3.8.16-9"
"version": "3.8.16-11"
}
}

View File

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

View File

@@ -21,7 +21,7 @@ declare -a args=("run" "$@")
info "** Starting Ghost **"
cd "$GHOST_BASE_DIR" || false
if am_i_root; then
exec gosu "$GHOST_DAEMON_USER" ghost "${args[@]}"
exec_as_user "$GHOST_DAEMON_USER" ghost "${args[@]}"
else
exec ghost "${args[@]}"
fi

View File

@@ -65,7 +65,7 @@ ghost_stop() {
info "Stopping Ghost"
cd "$GHOST_BASE_DIR" || return 1
if am_i_root; then
debug_execute gosu "$GHOST_DAEMON_USER" ghost stop
debug_execute run_as_user "$GHOST_DAEMON_USER" ghost stop
else
debug_execute ghost stop
fi
@@ -86,7 +86,7 @@ ghost_start_bg() {
if am_i_root; then
touch "$GHOST_LOG_FILE"
configure_permissions_ownership "$GHOST_LOG_FILE" -u "$GHOST_DAEMON_USER" -g "$GHOST_DAEMON_GROUP"
gosu "$GHOST_DAEMON_USER" ghost start --no-enable >>"$GHOST_LOG_FILE" 2>&1
run_as_user "$GHOST_DAEMON_USER" ghost start --no-enable >>"$GHOST_LOG_FILE" 2>&1
else
ghost start --no-enable >>"$GHOST_LOG_FILE" 2>&1
fi
@@ -297,7 +297,7 @@ ghost_initialize() {
"--process" "local" "--no-prompt" "--no-start" "--no-enable"
)
if am_i_root; then
debug_execute gosu "$GHOST_DAEMON_USER" ghost setup "${setup_flags[@]}"
debug_execute run_as_user "$GHOST_DAEMON_USER" ghost setup "${setup_flags[@]}"
else
debug_execute ghost setup "${setup_flags[@]}"
fi

View File

@@ -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\'"