9.6.18-debian-10-r57 release
This commit is contained in:
parent
994576e563
commit
72433761ce
|
|
@ -22,7 +22,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
|
|||
COPY rootfs /
|
||||
RUN /opt/bitnami/scripts/postgresql/postunpack.sh
|
||||
ENV BITNAMI_APP_NAME="postgresql" \
|
||||
BITNAMI_IMAGE_VERSION="9.6.18-debian-10-r56" \
|
||||
BITNAMI_IMAGE_VERSION="9.6.18-debian-10-r57" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US:en" \
|
||||
NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
|
||||
|
|
|
|||
|
|
@ -46,8 +46,9 @@ persist_app() {
|
|||
file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")"
|
||||
file_to_persist_destination="${persist_dir}/${file_to_persist_relative}"
|
||||
file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
|
||||
# Get original permissions (except for the root directory, to avoid issues with volumes)
|
||||
find "$file_to_persist_relative" | grep -E -v '^\.$' | xargs getfacl -R > "$tmp_file"
|
||||
# Get original permissions for existing files, which will be applied later
|
||||
# Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume
|
||||
getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file"
|
||||
# Copy directories to the volume
|
||||
ensure_dir_exists "$file_to_persist_destination_folder"
|
||||
cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
|
||||
|
|
@ -62,6 +63,7 @@ persist_app() {
|
|||
popd >/dev/null
|
||||
done
|
||||
popd >/dev/null
|
||||
rm -f "$tmp_file"
|
||||
# Install the persisted files into the installation directory, via symlinks
|
||||
restore_persisted_app "$@"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,64 @@ stop_service_using_pid() {
|
|||
done
|
||||
}
|
||||
|
||||
########################
|
||||
# Start cron daemon
|
||||
# Arguments:
|
||||
# None
|
||||
# Returns:
|
||||
# true if started correctly, false otherwise
|
||||
#########################
|
||||
cron_start() {
|
||||
if [[ -x "/usr/sbin/cron" ]]; then
|
||||
/usr/sbin/cron
|
||||
elif [[ -x "/usr/sbin/crond" ]]; then
|
||||
/usr/sbin/crond
|
||||
else
|
||||
false
|
||||
fi
|
||||
}
|
||||
|
||||
########################
|
||||
# Generate a cron configuration file for a given service
|
||||
# Arguments:
|
||||
# $1 - Service name
|
||||
# $2 - Command
|
||||
# Flags:
|
||||
# --run-as - User to run as (default: root)
|
||||
# --schedule - Cron schedule configuration (default: * * * * *)
|
||||
# Returns:
|
||||
# None
|
||||
#########################
|
||||
generate_cron_conf() {
|
||||
local service_name="${1:?service name is missing}"
|
||||
local cmd="${2:?command is missing}"
|
||||
local run_as="root"
|
||||
local schedule="* * * * *"
|
||||
|
||||
# Parse optional CLI flags
|
||||
shift 2
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--run-as)
|
||||
shift
|
||||
run_as="$1"
|
||||
;;
|
||||
--schedule)
|
||||
shift
|
||||
schedule="$1"
|
||||
;;
|
||||
*)
|
||||
echo "Invalid command line flag ${1}" >&2
|
||||
return 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
mkdir -p /etc/cron.d
|
||||
echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
|
||||
}
|
||||
|
||||
########################
|
||||
# Generate a monit configuration file for a given service
|
||||
# Arguments:
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ web_server_reload() {
|
|||
########################
|
||||
ensure_web_server_app_configuration_exists() {
|
||||
local app="${1:?missing app}"
|
||||
local -a args=()
|
||||
local -a args=("$app")
|
||||
# Validate arguments
|
||||
shift
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
|
|
@ -165,7 +165,7 @@ ensure_web_server_app_configuration_exists() {
|
|||
| --https-port \
|
||||
| --document-root \
|
||||
)
|
||||
args+=("$1" "$2")
|
||||
args+=("$1" "${2:?missing value}")
|
||||
shift
|
||||
;;
|
||||
|
||||
|
|
@ -176,13 +176,13 @@ ensure_web_server_app_configuration_exists() {
|
|||
| --apache-extra-directory-configuration \
|
||||
| --apache-move-htaccess \
|
||||
)
|
||||
[[ "$(web_server_type)" == "apache" ]] && args+=("${1//apache-/}" "$2")
|
||||
[[ "$(web_server_type)" == "apache" ]] && args+=("${1//apache-/}" "${2:?missing value}")
|
||||
shift
|
||||
;;
|
||||
|
||||
# Specific NGINX flags
|
||||
--nginx-additional-configuration)
|
||||
[[ "$(web_server_type)" == "nginx" ]] && args+=("${1//nginx-/}" "$2")
|
||||
[[ "$(web_server_type)" == "nginx" ]] && args+=("${1//nginx-/}" "${2:?missing value}")
|
||||
shift
|
||||
;;
|
||||
|
||||
|
|
@ -193,7 +193,7 @@ ensure_web_server_app_configuration_exists() {
|
|||
esac
|
||||
shift
|
||||
done
|
||||
"ensure_$(web_server_type)_app_configuration_exists" "$app" "${args[@]}"
|
||||
"ensure_$(web_server_type)_app_configuration_exists" "${args[@]}"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
@ -235,7 +235,7 @@ ensure_web_server_app_configuration_not_exists() {
|
|||
########################
|
||||
ensure_web_server_prefix_configuration_exists() {
|
||||
local app="${1:?missing app}"
|
||||
local -a args=()
|
||||
local -a args=("$app")
|
||||
# Validate arguments
|
||||
shift
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
|
|
@ -246,7 +246,7 @@ ensure_web_server_prefix_configuration_exists() {
|
|||
| --prefix \
|
||||
| --type \
|
||||
)
|
||||
args+=("$1" "$2")
|
||||
args+=("$1" "${2:?missing value}")
|
||||
shift
|
||||
;;
|
||||
|
||||
|
|
@ -273,7 +273,7 @@ ensure_web_server_prefix_configuration_exists() {
|
|||
esac
|
||||
shift
|
||||
done
|
||||
"ensure_$(web_server_type)_prefix_configuration_exists" "$app" "${args[@]}"
|
||||
"ensure_$(web_server_type)_prefix_configuration_exists" "${args[@]}"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
@ -293,7 +293,7 @@ ensure_web_server_prefix_configuration_exists() {
|
|||
########################
|
||||
web_server_update_app_configuration() {
|
||||
local app="${1:?missing app}"
|
||||
local -a args=()
|
||||
local -a args=("$app")
|
||||
# Validate arguments
|
||||
shift
|
||||
while [[ "$#" -gt 0 ]]; do
|
||||
|
|
@ -304,7 +304,7 @@ web_server_update_app_configuration() {
|
|||
| --http-port \
|
||||
| --https-port \
|
||||
)
|
||||
args+=("$1" "$2")
|
||||
args+=("$1" "${2:?missing value}")
|
||||
shift
|
||||
;;
|
||||
|
||||
|
|
@ -315,7 +315,7 @@ web_server_update_app_configuration() {
|
|||
esac
|
||||
shift
|
||||
done
|
||||
"$(web_server_type)_update_app_configuration" "$app" "${args[@]}"
|
||||
"$(web_server_type)_update_app_configuration" "${args[@]}"
|
||||
}
|
||||
|
||||
########################
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
|
|||
* [`12-debian-10`, `12.3.0-debian-10-r54`, `12`, `12.3.0` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.3.0-debian-10-r54/12/debian-10/Dockerfile)
|
||||
* [`11-debian-10`, `11.8.0-debian-10-r58`, `11`, `11.8.0`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.8.0-debian-10-r58/11/debian-10/Dockerfile)
|
||||
* [`10-debian-10`, `10.13.0-debian-10-r54`, `10`, `10.13.0` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.13.0-debian-10-r54/10/debian-10/Dockerfile)
|
||||
* [`9.6-debian-10`, `9.6.18-debian-10-r56`, `9.6`, `9.6.18` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.18-debian-10-r56/9.6/debian-10/Dockerfile)
|
||||
* [`9.6-debian-10`, `9.6.18-debian-10-r57`, `9.6`, `9.6.18` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.18-debian-10-r57/9.6/debian-10/Dockerfile)
|
||||
|
||||
Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue