[bitnami/joomla] Release 4.2.2-debian-11-r7 (#7263)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2022-09-21 13:34:00 +02:00
committed by GitHub
parent b78bfa41ae
commit c08b6a3667
5 changed files with 87 additions and 31 deletions

View File

@@ -22,24 +22,24 @@
},
"libphp": {
"arch": "amd64",
"digest": "76cbb5156e406bc38a0816d3a70b21326ac12a546e5279d9be6d38e2be493060",
"digest": "32f26047b105650e492c2160ce277a9be85c83484d64f9d2db67a93fa4fe7459",
"distro": "debian-11",
"type": "NAMI",
"version": "8.0.23-0"
"version": "8.0.23-1"
},
"mysql-client": {
"arch": "amd64",
"digest": "14ae2f6d8d5f4e3a9e4cf62d5a3da80587a20651a5920dbc4ac89afdaf06f8c0",
"digest": "8a1d2ee97e1e6b337254b886f99392ea181cc1708965212e776b205dd61731a2",
"distro": "debian-11",
"type": "NAMI",
"version": "10.6.9-1"
"version": "10.6.10-0"
},
"php": {
"arch": "amd64",
"digest": "a17043c3bc38c09f25749466f79f39d4cd3826a46723f07c83795aaac7bdc5e3",
"digest": "9e74baed2d48536f078de6ec63cf5618d4815aba1d76666e2b42805cc698674c",
"distro": "debian-11",
"type": "NAMI",
"version": "8.0.23-3"
"version": "8.0.23-4"
},
"render-template": {
"arch": "amd64",

View File

@@ -197,6 +197,8 @@ am_i_root() {
# --version - Distro version
# --branch - Distro branch
# --codename - Distro codename
# --name - Distro name
# --pretty-name - Distro pretty name
# Returns:
# String
#########################
@@ -223,6 +225,12 @@ get_os_metadata() {
--codename)
get_os_release_metadata VERSION_CODENAME
;;
--name)
get_os_release_metadata NAME
;;
--pretty-name)
get_os_release_metadata PRETTY_NAME
;;
*)
error "Unknown flag ${flag_name}"
return 1
@@ -498,3 +506,50 @@ get_machine_id() {
fi
echo "$machine_id"
}
########################
# Get the root partition's disk device ID (e.g. /dev/sda1)
# Globals:
# None
# Arguments:
# None
# Returns:
# Root partition disk ID
#########################
get_disk_device_id() {
local device_id=""
if grep -q ^/dev /proc/mounts; then
device_id="$(grep -q ^/dev /proc/mounts | awk '$2 == "/" { print $1 }' | tail -1)"
fi
# If it could not be autodetected, fallback to /dev/sda1 as a default
if [[ -z "$device_id" || ! -b "$device_id" ]]; then
device_id="/dev/sda1"
fi
echo "$device_id"
}
########################
# Get the root disk device ID (e.g. /dev/sda)
# Globals:
# None
# Arguments:
# None
# Returns:
# Root disk ID
#########################
get_root_disk_device_id() {
get_disk_device_id | sed 's/[0-9]\+$//'
}
########################
# Get the root disk size in bytes
# Globals:
# None
# Arguments:
# None
# Returns:
# Root disk size in bytes
#########################
get_root_disk_size() {
fdisk -l "$(get_root_disk_device_id)" | grep 'Disk.*bytes' | sed -E 's/.*, ([0-9]+) bytes,.*/\1/' || true
}

View File

@@ -1,9 +1,10 @@
#!/bin/sh
set -e
set -u
export DEBIAN_FRONTEND=noninteractive
set -eu
n=0
max=2
export DEBIAN_FRONTEND=noninteractive
until [ $n -gt $max ]; do
set +e
(
@@ -21,4 +22,4 @@ until [ $n -gt $max ]; do
echo "apt failed, retrying"
n=$(($n + 1))
done
rm -r /var/lib/apt/lists /var/cache/apt/archives
apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives