diff --git a/bitnami/phpmyadmin/5/debian-10/Dockerfile b/bitnami/phpmyadmin/5/debian-10/Dockerfile index 72099283252d..1135068040ad 100644 --- a/bitnami/phpmyadmin/5/debian-10/Dockerfile +++ b/bitnami/phpmyadmin/5/debian-10/Dockerfile @@ -9,7 +9,7 @@ ENV HOME="/" \ COPY prebuildfs / # Install required system packages and dependencies RUN install_packages acl ca-certificates curl gzip libaudit1 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libonig5 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsodium23 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libwebp6 libxml2 libxslt1.1 libzip4 procps tar zlib1g -RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.3-3" --checksum 7a7d41e2a2f00c08d407b0f17a6f70c968e3de23c5be2b6de2797c280579b789 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "8.0.3-4" --checksum 70f8ec5a47d3b5458a63bb7a75a1826bb989aca19026a518081dd1a553889f89 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-6" --checksum fb5216cb32c47100d039af1b738b2e9d48f48aac194ca9b47ffb9ea42517a9ea RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.28-0" --checksum 9398376ca9e2033d5bc193232e8aa9b57d91d4ccf06fa67bfa0d30ef36e44c25 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "8.0.3-0" --checksum fb54edcd26a5a199901f4c1d0012a2a367901d67b424be4163ad38eea875cf3d @@ -19,8 +19,8 @@ RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" RUN chmod g+rwX /opt/bitnami COPY rootfs / -RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/apache/postunpack.sh RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh RUN /opt/bitnami/scripts/phpmyadmin/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ @@ -28,7 +28,7 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_HTTPS_PORT_NUMBER="" \ APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r31" \ + BITNAMI_IMAGE_VERSION="5.1.0-debian-10-r32" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ diff --git a/bitnami/phpmyadmin/5/debian-10/docker-compose.yml b/bitnami/phpmyadmin/5/debian-10/docker-compose.yml index 7ac41aa3aea8..60be385f7123 100644 --- a/bitnami/phpmyadmin/5/debian-10/docker-compose.yml +++ b/bitnami/phpmyadmin/5/debian-10/docker-compose.yml @@ -1,13 +1,13 @@ version: '2' services: mariadb: - image: 'docker.io/bitnami/mariadb:10.3-debian-10' + image: docker.io/bitnami/mariadb:10.3 environment: - MARIADB_ROOT_PASSWORD=bitnami volumes: - 'mariadb_data:/bitnami' phpmyadmin: - image: 'docker.io/bitnami/phpmyadmin:5-debian-10' + image: docker.io/bitnami/phpmyadmin:5 ports: - '80:8080' - '443:8443' diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index d0b13bdc8d2d..a892ecef3bd5 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -29,10 +29,10 @@ }, "php": { "arch": "amd64", - "digest": "7a7d41e2a2f00c08d407b0f17a6f70c968e3de23c5be2b6de2797c280579b789", + "digest": "70f8ec5a47d3b5458a63bb7a75a1826bb989aca19026a518081dd1a553889f89", "distro": "debian-10", "type": "NAMI", - "version": "8.0.3-3" + "version": "8.0.3-4" }, "phpmyadmin": { "arch": "amd64", diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh index 60ec4cbfc32a..cfc824f5ec83 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -106,5 +106,5 @@ indent() { for ((i = 0; i < num; i++)); do indent_unit="${indent_unit}${char}" done - echo "$string" | sed "s/^/${indent_unit}/" + echo "${string//^/${indent_unit}}" } diff --git a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh index 66d4f457bdd2..f3bc7568bfa5 100644 --- a/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/phpmyadmin/5/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -9,7 +9,7 @@ # Functions ######################## -# Gets semantic version +# Gets semantic version # Arguments: # $1 - version: string to extract major.minor.patch # $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch @@ -38,7 +38,7 @@ get_sematic_version () { done local number_regex='^[0-9]+$' - if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + if [[ "$section" =~ $number_regex ]] && (( section > 0 )) && (( section <= 3 )); then echo "${version_sections[$section]}" return else diff --git a/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.d/shell.sh b/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.d/shell.sh index 665152ba8b6f..7b244a71294c 100755 --- a/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.d/shell.sh +++ b/bitnami/phpmyadmin/5/debian-10/rootfs/post-init.d/shell.sh @@ -2,8 +2,7 @@ # # Executes custom Bash init scripts -# shellcheck disable=SC1090 -# shellcheck disable=SC1091 +# shellcheck disable=SC1090,SC1091 set -o errexit set -o nounset diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index 1ae339b2aaba..5bd9282bb1e0 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) 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/). -* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r31`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r31/5/debian-10/Dockerfile) +* [`5`, `5-debian-10`, `5.1.0`, `5.1.0-debian-10-r32`, `latest` (5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/5.1.0-debian-10-r32/5/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin). diff --git a/bitnami/phpmyadmin/docker-compose.yml b/bitnami/phpmyadmin/docker-compose.yml index 7ac41aa3aea8..60be385f7123 100644 --- a/bitnami/phpmyadmin/docker-compose.yml +++ b/bitnami/phpmyadmin/docker-compose.yml @@ -1,13 +1,13 @@ version: '2' services: mariadb: - image: 'docker.io/bitnami/mariadb:10.3-debian-10' + image: docker.io/bitnami/mariadb:10.3 environment: - MARIADB_ROOT_PASSWORD=bitnami volumes: - 'mariadb_data:/bitnami' phpmyadmin: - image: 'docker.io/bitnami/phpmyadmin:5-debian-10' + image: docker.io/bitnami/phpmyadmin:5 ports: - '80:8080' - '443:8443'