Skip to content

Commit

Permalink
Fix docker mariadb-client version
Browse files Browse the repository at this point in the history
  • Loading branch information
Murazaki committed Feb 11, 2025
1 parent f64e780 commit 1af4481
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion docker/rootfs/shared/docker/install/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docker/rootfs/shared/docker/install/php.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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[*]}
Expand Down

0 comments on commit 1af4481

Please sign in to comment.