diff --git a/docker/rootfs/shared/docker/install/base.sh b/docker/rootfs/shared/docker/install/base.sh index c7043ea4f7..b5b4c814b3 100755 --- a/docker/rootfs/shared/docker/install/base.sh +++ b/docker/rootfs/shared/docker/install/base.sh @@ -56,9 +56,14 @@ packages+=( readarray -d ' ' -t -O "${#packages[@]}" packages < <(echo -n "${APT_PACKAGES_EXTRA:-}") +# Install MariaDB version that doesn't break on MariaDB dumps AND that still alias to mysql +apt-get update +apt-get install -y --no-install-recommends curl ca-certificates apt-transport-https +curl -LsS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup | bash -s -- --mariadb-server-version mariadb-10.11\ + apt-get update apt-get upgrade -y -apt-get install -y "${packages[@]}" +apt-get install -y --no-install-recommends "${packages[@]}" locale-gen update-locale diff --git a/docker/rootfs/shared/docker/install/php.sh b/docker/rootfs/shared/docker/install/php.sh index 7f714cb849..ac6b5155f8 100755 --- a/docker/rootfs/shared/docker/install/php.sh +++ b/docker/rootfs/shared/docker/install/php.sh @@ -57,7 +57,7 @@ readarray -d ' ' -t -O "${#pecl_extensions[@]}" pecl_extensions < <(echo -n "${P # install dh-php and PECL extensions if any are configured if [ ${#pecl_extensions[@]} -gt 0 ]; then - apt-get install -y dh-php + apt-get install -y --no-install-recommends dh-php # shellcheck disable=SC2086,SC2048 pecl install ${pecl_extensions[*]}