diff --git a/docker-compose.yml b/docker-compose.yml index 6a85fd397d78ee1eba771dbcb5a1cc85e261d62c..90318fdc754e34a26bd022445d261108730e8fe5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ networks: - subnet: 10.0.${SUBNET}.0/24 services: db: - image: mysql:${MYSQL_VERSION:-5.7} + image: mariadb:${MYSQL_VERSION:-10.5} volumes: - ./db/mysql/runtime:/var/lib/mysql environment: diff --git a/scripts/install b/scripts/install index 16f80bab6710c6bd5785d30b7aba4b6b3ba01233..29fc2d1ea19687c8fbb8f75daa9c2f55934c6cea 100755 --- a/scripts/install +++ b/scripts/install @@ -3,7 +3,7 @@ source /etc/environment -WORDPRESS_VERSION=5.9-fpm +WORDPRESS_VERSION=6.0-fpm MYSQL_ROOT_PASSWORD=`tr -dc A-Za-z0-9_ < /dev/urandom | head -c 20 | xargs` var=$(for folder in `ls /data/domains`; do cat /data/domains/$folder/.env | grep SUBNET | cut -d"=" -f2; done | sort | tail -n1) @@ -22,4 +22,4 @@ echo "SUBNET=${SUBNET}" >> .env echo "WORDPRESS_VERSION=${WORDPRESS_VERSION}" >> .env -echo "MYSQL_VERSION=5.7" >> .env +echo "MYSQL_VERSION=10.5" >> .env