[bitnami/appsmith] Release 1.9.16-debian-11-r0 (#30895)
Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
parent
730acd3c39
commit
8881bd26a6
|
|
@ -3,13 +3,13 @@ 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-17T18:15:39Z" \
|
||||
org.opencontainers.image.created="2023-04-19T19:25:25Z" \
|
||||
org.opencontainers.image.description="Application packaged by VMware, Inc" \
|
||||
org.opencontainers.image.licenses="Apache-2.0" \
|
||||
org.opencontainers.image.ref.name="1.9.15-debian-11-r4" \
|
||||
org.opencontainers.image.ref.name="1.9.16-debian-11-r0" \
|
||||
org.opencontainers.image.title="appsmith" \
|
||||
org.opencontainers.image.vendor="VMware, Inc." \
|
||||
org.opencontainers.image.version="1.9.15"
|
||||
org.opencontainers.image.version="1.9.16"
|
||||
|
||||
ENV HOME="/" \
|
||||
OS_ARCH="${TARGETARCH:-amd64}" \
|
||||
|
|
@ -23,14 +23,13 @@ RUN install_packages acl ca-certificates curl gettext libbz2-1.0 libcom-err2 lib
|
|||
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
|
||||
COMPONENTS=( \
|
||||
"python-3.8.16-9-linux-${OS_ARCH}-debian-11" \
|
||||
"wait-for-port-1.0.6-4-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.5-4-linux-${OS_ARCH}-debian-11" \
|
||||
"wait-for-port-1.0.6-6-linux-${OS_ARCH}-debian-11" \
|
||||
"render-template-1.0.5-5-linux-${OS_ARCH}-debian-11" \
|
||||
"node-16.20.0-1-linux-${OS_ARCH}-debian-11" \
|
||||
"nginx-1.23.4-3-linux-${OS_ARCH}-debian-11" \
|
||||
"mongodb-shell-1.8.0-3-linux-${OS_ARCH}-debian-11" \
|
||||
"java-17.0.6-10-4-linux-${OS_ARCH}-debian-11" \
|
||||
"gosu-1.16.0-5-linux-${OS_ARCH}-debian-11" \
|
||||
"appsmith-1.9.15-1-linux-${OS_ARCH}-debian-11" \
|
||||
"java-17.0.7-7-0-linux-${OS_ARCH}-debian-11" \
|
||||
"appsmith-1.9.16-0-linux-${OS_ARCH}-debian-11" \
|
||||
) && \
|
||||
for COMPONENT in "${COMPONENTS[@]}"; do \
|
||||
if [ ! -f "${COMPONENT}.tar.gz" ]; then \
|
||||
|
|
@ -48,7 +47,7 @@ RUN chmod g+rwX /opt/bitnami
|
|||
COPY rootfs /
|
||||
RUN /opt/bitnami/scripts/nginx/postunpack.sh
|
||||
RUN /opt/bitnami/scripts/appsmith/postunpack.sh
|
||||
ENV APP_VERSION="1.9.15" \
|
||||
ENV APP_VERSION="1.9.16" \
|
||||
BITNAMI_APP_NAME="appsmith" \
|
||||
NGINX_HTTPS_PORT_NUMBER="" \
|
||||
NGINX_HTTP_PORT_NUMBER="" \
|
||||
|
|
|
|||
|
|
@ -3,19 +3,13 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.9.15-1"
|
||||
},
|
||||
"gosu": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.16.0-5"
|
||||
"version": "1.9.16-0"
|
||||
},
|
||||
"java": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "17.0.6-10-4"
|
||||
"version": "17.0.7-7-0"
|
||||
},
|
||||
"mongodb-shell": {
|
||||
"arch": "amd64",
|
||||
|
|
@ -45,12 +39,12 @@
|
|||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.5-4"
|
||||
"version": "1.0.5-5"
|
||||
},
|
||||
"wait-for-port": {
|
||||
"arch": "amd64",
|
||||
"distro": "debian-11",
|
||||
"type": "NAMI",
|
||||
"version": "1.0.6-4"
|
||||
"version": "1.0.6-6"
|
||||
}
|
||||
}
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@ fi
|
|||
|
||||
info "** Starting Appsmith ${APPSMITH_MODE} **"
|
||||
if am_i_root; then
|
||||
exec gosu "$APPSMITH_DAEMON_USER" "${cmd[@]}" "${args[@]}"
|
||||
exec_as_user "$APPSMITH_DAEMON_USER" "${cmd[@]}" "${args[@]}"
|
||||
else
|
||||
exec "${cmd[@]}" "${args[@]}"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ appsmith_backend_start_bg() {
|
|||
local -r cmd=("java")
|
||||
local -r args=("-Dserver.port=${APPSMITH_API_PORT}" "-Dappsmith.admin.envfile=${APPSMITH_CONF_FILE}" "-Djava.security.egd=file:/dev/./urandom" "-jar" "${APPSMITH_BASE_DIR}/backend/server.jar")
|
||||
if am_i_root; then
|
||||
gosu "$APPSMITH_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
|
||||
run_as_user "$APPSMITH_DAEMON_USER" "${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
|
||||
else
|
||||
"${cmd[@]}" "${args[@]}" >"$log_file" 2>&1 &
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
rolling-tags:
|
||||
- "1"
|
||||
- 1-debian-11
|
||||
- 1.9.15
|
||||
- 1.9.16
|
||||
- latest
|
||||
|
|
|
|||
Loading…
Reference in New Issue