From 3adb910458a0bf804a585cec44c81f821da56a5b Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 22 Sep 2022 20:26:25 +0200 Subject: [PATCH] [bitnami/magento] Release 2.4.5-debian-11-r15 (#7405) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/magento/2/debian-11/Dockerfile | 16 +++--- .../opt/bitnami/.bitnami_components.json | 4 +- .../prebuildfs/opt/bitnami/scripts/libos.sh | 55 +++++++++++++++++++ .../prebuildfs/usr/sbin/install_packages | 9 +-- bitnami/magento/README.md | 2 +- 5 files changed, 71 insertions(+), 15 deletions(-) diff --git a/bitnami/magento/2/debian-11/Dockerfile b/bitnami/magento/2/debian-11/Dockerfile index 350273207da0..53e35dc9dfa6 100644 --- a/bitnami/magento/2/debian-11/Dockerfile +++ b/bitnami/magento/2/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="2.4.5-debian-11-r14" \ + org.opencontainers.image.ref.name="2.4.5-debian-11-r15" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/magento" \ org.opencontainers.image.title="magento" \ org.opencontainers.image.vendor="VMware, Inc." \ @@ -44,13 +44,13 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf wait-for-port-1.0.3-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf wait-for-port-1.0.3-154-linux-${OS_ARCH}-debian-11.tar.gz wait-for-port-1.0.3-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - if [ ! -f mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ - curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ + if [ ! -f mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ + curl -SsLf https://downloads.bitnami.com/files/stacksmith/mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \ fi && \ - sha256sum -c mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ - tar -zxf mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ - rm -rf mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz mysql-client-10.6.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 + sha256sum -c mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \ + tar -zxf mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ + rm -rf mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz mysql-client-10.6.10-0-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ if [ ! -f libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \ curl -SsLf https://downloads.bitnami.com/files/stacksmith/libphp-8.1.10-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \ @@ -84,7 +84,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ tar -zxf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \ rm -rf gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz gosu-1.14.0-154-linux-${OS_ARCH}-debian-11.tar.gz.sha256 RUN apt-get update && apt-get upgrade -y && \ - rm -r /var/lib/apt/lists /var/cache/apt/archives + apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json index e230833db995..1c67c820984d 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "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", diff --git a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh index 08b1d4884c28..92530b32d94d 100644 --- a/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/magento/2/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh @@ -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 +} diff --git a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/install_packages index c9577647443b..77857a1a57f2 100755 --- a/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/install_packages +++ b/bitnami/magento/2/debian-11/prebuildfs/usr/sbin/install_packages @@ -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 diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index d78866d6c721..b1cb591d88c4 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -37,7 +37,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.dev/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`2`, `2-debian-11`, `2.4.5`, `2.4.5-debian-11-r14`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/magento/2/debian-11/Dockerfile) +* [`2`, `2-debian-11`, `2.4.5`, `2.4.5-debian-11-r15`, `latest` (2/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/magento/2/debian-11/Dockerfile) Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).