11.0.13-prod-debian-10-r58 release
This commit is contained in:
parent
fecdd8af7a
commit
2c2a20e4d9
|
|
@ -25,7 +25,7 @@ COPY rootfs /
|
||||||
RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
|
RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
|
||||||
RUN /opt/bitnami/scripts/java/postunpack.sh
|
RUN /opt/bitnami/scripts/java/postunpack.sh
|
||||||
ENV BITNAMI_APP_NAME="java" \
|
ENV BITNAMI_APP_NAME="java" \
|
||||||
BITNAMI_IMAGE_VERSION="11.0.13-prod-debian-10-r57" \
|
BITNAMI_IMAGE_VERSION="11.0.13-prod-debian-10-r58" \
|
||||||
JAVA_HOME="/opt/bitnami/java" \
|
JAVA_HOME="/opt/bitnami/java" \
|
||||||
LANG="en_US.UTF-8" \
|
LANG="en_US.UTF-8" \
|
||||||
LANGUAGE="en_US:en" \
|
LANGUAGE="en_US:en" \
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
# Load Generic Libraries
|
# Load Generic Libraries
|
||||||
. /opt/bitnami/scripts/liblog.sh
|
. /opt/bitnami/scripts/liblog.sh
|
||||||
. /opt/bitnami/scripts/libfs.sh
|
. /opt/bitnami/scripts/libfs.sh
|
||||||
|
. /opt/bitnami/scripts/libvalidations.sh
|
||||||
|
|
||||||
# Functions
|
# Functions
|
||||||
|
|
||||||
|
|
@ -53,17 +54,17 @@ ensure_group_exists() {
|
||||||
shift 1
|
shift 1
|
||||||
while [ "$#" -gt 0 ]; do
|
while [ "$#" -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-i|--gid)
|
-i | --gid)
|
||||||
shift
|
shift
|
||||||
gid="${1:?missing gid}"
|
gid="${1:?missing gid}"
|
||||||
;;
|
;;
|
||||||
-s|--system)
|
-s | --system)
|
||||||
is_system_user=true
|
is_system_user=true
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid command line flag $1" >&2
|
echo "Invalid command line flag $1" >&2
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
@ -71,7 +72,7 @@ ensure_group_exists() {
|
||||||
if ! group_exists "$group"; then
|
if ! group_exists "$group"; then
|
||||||
local -a args=("$group")
|
local -a args=("$group")
|
||||||
if [[ -n "$gid" ]]; then
|
if [[ -n "$gid" ]]; then
|
||||||
if group_exists "$gid" ; then
|
if group_exists "$gid"; then
|
||||||
error "The GID $gid is already in use." >&2
|
error "The GID $gid is already in use." >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
@ -107,29 +108,29 @@ ensure_user_exists() {
|
||||||
shift 1
|
shift 1
|
||||||
while [ "$#" -gt 0 ]; do
|
while [ "$#" -gt 0 ]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-i|--uid)
|
-i | --uid)
|
||||||
shift
|
shift
|
||||||
uid="${1:?missing uid}"
|
uid="${1:?missing uid}"
|
||||||
;;
|
;;
|
||||||
-g|--group)
|
-g | --group)
|
||||||
shift
|
shift
|
||||||
group="${1:?missing group}"
|
group="${1:?missing group}"
|
||||||
;;
|
;;
|
||||||
-a|--append-groups)
|
-a | --append-groups)
|
||||||
shift
|
shift
|
||||||
append_groups="${1:?missing append_groups}"
|
append_groups="${1:?missing append_groups}"
|
||||||
;;
|
;;
|
||||||
-h|--home)
|
-h | --home)
|
||||||
shift
|
shift
|
||||||
home="${1:?missing home directory}"
|
home="${1:?missing home directory}"
|
||||||
;;
|
;;
|
||||||
-s|--system)
|
-s | --system)
|
||||||
is_system_user=true
|
is_system_user=true
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid command line flag $1" >&2
|
echo "Invalid command line flag $1" >&2
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
@ -137,7 +138,7 @@ ensure_user_exists() {
|
||||||
if ! user_exists "$user"; then
|
if ! user_exists "$user"; then
|
||||||
local -a user_args=("-N" "$user")
|
local -a user_args=("-N" "$user")
|
||||||
if [[ -n "$uid" ]]; then
|
if [[ -n "$uid" ]]; then
|
||||||
if user_exists "$uid" ; then
|
if user_exists "$uid"; then
|
||||||
error "The UID $uid is already in use."
|
error "The UID $uid is already in use."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
@ -157,7 +158,7 @@ ensure_user_exists() {
|
||||||
|
|
||||||
if [[ -n "$append_groups" ]]; then
|
if [[ -n "$append_groups" ]]; then
|
||||||
local -a groups
|
local -a groups
|
||||||
read -ra groups <<< "$(tr ',;' ' ' <<< "$append_groups")"
|
read -ra groups <<<"$(tr ',;' ' ' <<<"$append_groups")"
|
||||||
for group in "${groups[@]}"; do
|
for group in "${groups[@]}"; do
|
||||||
ensure_group_exists "$group"
|
ensure_group_exists "$group"
|
||||||
usermod -aG "$group" "$user" >/dev/null 2>&1
|
usermod -aG "$group" "$user" >/dev/null 2>&1
|
||||||
|
|
@ -210,21 +211,22 @@ get_os_metadata() {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
case "$flag_name" in
|
case "$flag_name" in
|
||||||
--id)
|
--id)
|
||||||
get_os_release_metadata ID
|
get_os_release_metadata ID
|
||||||
;;
|
;;
|
||||||
--version)
|
--version)
|
||||||
get_os_release_metadata VERSION_ID
|
get_os_release_metadata VERSION_ID
|
||||||
;;
|
;;
|
||||||
--branch)
|
--branch)
|
||||||
get_os_release_metadata VERSION_ID | sed 's/\..*//'
|
get_os_release_metadata VERSION_ID | sed 's/\..*//'
|
||||||
;;
|
;;
|
||||||
--codename)
|
--codename)
|
||||||
get_os_release_metadata VERSION_CODENAME
|
get_os_release_metadata VERSION_CODENAME
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
error "Unknown flag ${flag_name}"
|
error "Unknown flag ${flag_name}"
|
||||||
return 1
|
return 1
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -255,14 +257,14 @@ get_machine_size() {
|
||||||
# Validate arguments
|
# Validate arguments
|
||||||
while [[ "$#" -gt 0 ]]; do
|
while [[ "$#" -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
--memory)
|
--memory)
|
||||||
shift
|
shift
|
||||||
memory="${1:?missing memory}"
|
memory="${1:?missing memory}"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid command line flag $1" >&2
|
echo "Invalid command line flag $1" >&2
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
@ -314,7 +316,7 @@ convert_to_mb() {
|
||||||
size="${BASH_REMATCH[1]}"
|
size="${BASH_REMATCH[1]}"
|
||||||
unit="${BASH_REMATCH[2]}"
|
unit="${BASH_REMATCH[2]}"
|
||||||
if [[ "$unit" = "g" || "$unit" = "G" ]]; then
|
if [[ "$unit" = "g" || "$unit" = "G" ]]; then
|
||||||
amount="$((size * 1024))"
|
amount="$((size * 1024))"
|
||||||
else
|
else
|
||||||
amount="$size"
|
amount="$size"
|
||||||
fi
|
fi
|
||||||
|
|
@ -322,7 +324,6 @@ convert_to_mb() {
|
||||||
echo "$amount"
|
echo "$amount"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#########################
|
#########################
|
||||||
# Redirects output to /dev/null if debug mode is disabled
|
# Redirects output to /dev/null if debug mode is disabled
|
||||||
# Globals:
|
# Globals:
|
||||||
|
|
@ -333,7 +334,7 @@ convert_to_mb() {
|
||||||
# None
|
# None
|
||||||
#########################
|
#########################
|
||||||
debug_execute() {
|
debug_execute() {
|
||||||
if ${BITNAMI_DEBUG:-false}; then
|
if is_boolean_yes "${BITNAMI_DEBUG:-false}"; then
|
||||||
"$@"
|
"$@"
|
||||||
else
|
else
|
||||||
"$@" >/dev/null 2>&1
|
"$@" >/dev/null 2>&1
|
||||||
|
|
@ -355,8 +356,8 @@ retry_while() {
|
||||||
local sleep_time="${3:-5}"
|
local sleep_time="${3:-5}"
|
||||||
local return_value=1
|
local return_value=1
|
||||||
|
|
||||||
read -r -a command <<< "$cmd"
|
read -r -a command <<<"$cmd"
|
||||||
for ((i = 1 ; i <= retries ; i+=1 )); do
|
for ((i = 1; i <= retries; i += 1)); do
|
||||||
"${command[@]}" && return_value=0 && break
|
"${command[@]}" && return_value=0 && break
|
||||||
sleep "$sleep_time"
|
sleep "$sleep_time"
|
||||||
done
|
done
|
||||||
|
|
@ -383,35 +384,36 @@ generate_random_string() {
|
||||||
# Validate arguments
|
# Validate arguments
|
||||||
while [[ "$#" -gt 0 ]]; do
|
while [[ "$#" -gt 0 ]]; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-t|--type)
|
-t | --type)
|
||||||
shift
|
shift
|
||||||
type="$1"
|
type="$1"
|
||||||
;;
|
;;
|
||||||
-c|--count)
|
-c | --count)
|
||||||
shift
|
shift
|
||||||
count="$1"
|
count="$1"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid command line flag $1" >&2
|
echo "Invalid command line flag $1" >&2
|
||||||
return 1
|
return 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
# Validate type
|
# Validate type
|
||||||
case "$type" in
|
case "$type" in
|
||||||
ascii)
|
ascii)
|
||||||
filter="[:print:]"
|
filter="[:print:]"
|
||||||
;;
|
;;
|
||||||
alphanumeric)
|
alphanumeric)
|
||||||
filter="a-zA-Z0-9"
|
filter="a-zA-Z0-9"
|
||||||
;;
|
;;
|
||||||
numeric)
|
numeric)
|
||||||
filter="0-9"
|
filter="0-9"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid type ${type}" >&2
|
echo "Invalid type ${type}" >&2
|
||||||
return 1
|
return 1
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
# Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size
|
# Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size
|
||||||
# Note there is a very small chance of strings starting with EOL character
|
# Note there is a very small chance of strings starting with EOL character
|
||||||
|
|
@ -457,7 +459,7 @@ convert_to_hex() {
|
||||||
local -r str=${1:?missing input string}
|
local -r str=${1:?missing input string}
|
||||||
local -i iterator
|
local -i iterator
|
||||||
local char
|
local char
|
||||||
for ((iterator=0; iterator<${#str}; iterator++)); do
|
for ((iterator = 0; iterator < ${#str}; iterator++)); do
|
||||||
char=${str:iterator:1}
|
char=${str:iterator:1}
|
||||||
printf '%x' "'${char}"
|
printf '%x' "'${char}"
|
||||||
done
|
done
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
||||||
|
|
||||||
* [`17-prod`, `17-prod-debian-10`, `17.0.1-prod`, `17.0.1-prod-debian-10-r56` (17-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-prod-debian-10-r56/17-prod/debian-10/Dockerfile)
|
* [`17-prod`, `17-prod-debian-10`, `17.0.1-prod`, `17.0.1-prod-debian-10-r56` (17-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-prod-debian-10-r56/17-prod/debian-10/Dockerfile)
|
||||||
* [`17`, `17-debian-10`, `17.0.1`, `17.0.1-debian-10-r57`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r57/17/debian-10/Dockerfile)
|
* [`17`, `17-debian-10`, `17.0.1`, `17.0.1-debian-10-r57`, `latest` (17/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/17.0.1-debian-10-r57/17/debian-10/Dockerfile)
|
||||||
* [`11-prod`, `11-prod-debian-10`, `11.0.13-prod`, `11.0.13-prod-debian-10-r57` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r57/11-prod/debian-10/Dockerfile)
|
* [`11-prod`, `11-prod-debian-10`, `11.0.13-prod`, `11.0.13-prod-debian-10-r58` (11-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-prod-debian-10-r58/11-prod/debian-10/Dockerfile)
|
||||||
* [`11`, `11-debian-10`, `11.0.13`, `11.0.13-debian-10-r56` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-debian-10-r56/11/debian-10/Dockerfile)
|
* [`11`, `11-debian-10`, `11.0.13`, `11.0.13-debian-10-r56` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/11.0.13-debian-10-r56/11/debian-10/Dockerfile)
|
||||||
* [`1.8-prod`, `1.8-prod-debian-10`, `1.8.312-prod`, `1.8.312-prod-debian-10-r60` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-prod-debian-10-r60/1.8-prod/debian-10/Dockerfile)
|
* [`1.8-prod`, `1.8-prod-debian-10`, `1.8.312-prod`, `1.8.312-prod-debian-10-r60` (1.8-prod/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-prod-debian-10-r60/1.8-prod/debian-10/Dockerfile)
|
||||||
* [`1.8`, `1.8-debian-10`, `1.8.312`, `1.8.312-debian-10-r60` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-debian-10-r60/1.8/debian-10/Dockerfile)
|
* [`1.8`, `1.8-debian-10`, `1.8.312`, `1.8.312-debian-10-r60` (1.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-java/blob/1.8.312-debian-10-r60/1.8/debian-10/Dockerfile)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue