Update Docker Image to Ubuntu 24.04 ( Noble )

Vagrantfile

@@ -480,7 +480,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Docker use image.
   config.vm.provider :docker do |d, override|
-    d.image = 'pentatonicfunk/vagrant-ubuntu-base-images:20.04'
+    d.image = 'pentatonicfunk/vagrant-ubuntu-base-images:24.04'
     d.has_ssh = true
     d.ports =  [ "80:80" ] # HTTP
     d.ports += [ "443:443" ] # HTTPS

config/default-config.yml

@@ -146,6 +146,9 @@ general:
   # GitHub token to use from composer
   #github_token: xxxxxx
 
+  # Set the default version of PHP CLI
+  # php_cli_version: 8.2
+
 # Settings for the vagrant plugins supported by VVV
 vagrant-plugins:
   disksize: 10GB # requires the disk size vagrant plugin

config/homebin/vagrant_provision

@@ -16,6 +16,8 @@ source /srv/provision/provision-helpers.sh
 
 vvv_success " ▷ Post provision script"
 
+mysql_service_name=$(vvv_get_mysql_service_name)
+
 if [[ -f /srv/config/homebin/vagrant_provision_custom ]]; then
 	vvv_info " * Custom vagrant provision script found, executing vagrant_provision_custom"
 	/srv/config/homebin/vagrant_provision_custom
@@ -29,11 +31,11 @@ else
 fi
 
 vvv_info " * Restarting MariaDB service"
-if sudo service mariadb status > /dev/null; then
-  sudo service mariadb restart
-else
-  sudo service mariadb start
-fi
+if sudo service "${mysql_service_name[@]}" status > /dev/null; then
+    sudo service "${mysql_service_name[@]}" restart
+  else
+    sudo service "${mysql_service_name[@]}" start
+  fi
 
 if [ ! -f /.dockerenv ]; then
   if [ -x "$(command -v ntpdate)" ]; then

config/homebin/vagrant_up

@@ -22,24 +22,27 @@ TEARS="${CYAN}░${RED}"
 EYE="${CYAN}█${RED}"
 URL="\033[4;38;5;3m"
 
+mysql_service_name=$(vvv_get_mysql_service_name)
+
 if [[ -f /srv/config/homebin/vagrant_up_custom ]]; then
 	vvv_info " * Custom vagrant up script found, executing vagrant_up_custom"
 	/srv/config/homebin/vagrant_up_custom
   vvv_info " * Custom vagrant up script finished"
 fi
 
 # /etc/host doesn't survive restart on docker
-vvv_info " * Updatin Guest VM /etc/hosts"
+vvv_info " * Updating Guest VM /etc/hosts"
 vvv_update_guest_hosts
 
 if ! sudo service nginx status > /dev/null; then
   vvv_info " * Starting Nginx service"
   sudo service nginx start
 fi
 
-if ! sudo service mariadb status > /dev/null; then
-  vvv_info " * Starting MariaDB service"
-  sudo service mariadb start
+
+vvv_info " * Starting MariaDB service"
+if ! sudo service "${mysql_service_name[@]}" status > /dev/null; then
+  sudo service "${mysql_service_name[@]}" start
 fi
 
 vvv_info " * Checking PHP-FPM Services"

config/homebin/vvv_restore_php_default

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
-DEFAULTPHP="8.2"
+# Load config.yml
+VVV_CONFIG=/srv/config/default-config.yml
+if [[ -f /srv/config/config.yml ]]; then
+    VVV_CONFIG=/srv/config/config.yml
+fi
+
+DEFAULTPHP=$(cat ${VVV_CONFIG} | shyaml -q get-value general.php_cli_version "8.2")
 php_version=$(readlink -f /usr/bin/php)
 if [[ $php_version != *"${DEFAULTPHP}"* ]]; then
   echo " * Restoring the default PHP CLI version ( ${DEFAULTPHP} )"

provision/core/git/sources-ubuntu-noble.list

@@ -0,0 +1,3 @@
+# git lfs (large file storage plugin for git)
+deb https://packagecloud.io/github/git-lfs/ubuntu/ noble main
+deb-src https://packagecloud.io/github/git-lfs/ubuntu/ noble main

provision/core/mariadb/provision.sh

@@ -125,8 +125,10 @@ function mysql_setup() {
   vvv_info " * Copied /srv/provision/core/mariadb/config/debian.cnf          to /etc/mysql/debian.cnf"
 
   # Due to systemd dependencies, in docker, mysql service is not auto started
+  # also docker isn't systemd based, so thee service name is different: see: https://mariadb.com/kb/en/systemd/ vs https://mariadb.com/kb/en/sysvinit/
+  mysql_service_name=$(vvv_get_mysql_service_name)
   vvv_info " * Ensuring MariaDB service is started"
-  service mariadb status > /dev/null || service mariadb start
+  service "${mysql_service_name[@]}" status > /dev/null || service "${mysql_service_name[@]}" start
 
   if [ ! -f /.dockerenv ]; then
     check_mysql_root_password
@@ -135,19 +137,19 @@ function mysql_setup() {
   # MySQL gives us an error if we restart a non running service, which
   # happens after a `vagrant halt`. Check to see if it's running before
   # deciding whether to start or restart.
-  if service mariadb status > /dev/null; then
+  if service "${mysql_service_name[@]}" status > /dev/null; then
     vvv_info " * Restarting the mariadb service"
-    if ! service mariadb restart; then
+    if ! service "${mysql_service_name[@]}" restart; then
       vvv_error " * Restarting the MariaDB failed! Fetching service status."
-      service mariadb status
+      service "${mysql_service_name[@]}" status
       exit 1
     fi
   else
-    vvv_info " * Restarting mariadb service"
-    service mariadb start
-    if ! service mariadb start; then
+    vvv_info " * Starting mariadb service"
+    service "${mysql_service_name[@]}" start
+    if ! service "${mysql_service_name[@]}" start; then
       vvv_error " * Starting MariaDB failed! Fetching service status."
-      service mariadb status
+      service "${mysql_service_name[@]}" status
       exit 1
     fi
   fi

provision/core/mariadb/sources-ubuntu-focal.list

@@ -1,6 +1,6 @@
-# MariaDB 10.11 repository list - created 2024-08-27 19:47 UTC
+# MariaDB 10.11 repository list - created 2024-10-19 19:33 UTC
 # https://mariadb.org/download/
 # deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
 # deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu focal main
-deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main
-# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu focal main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu focal main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu focal main

provision/core/mariadb/sources-ubuntu-noble.list

@@ -2,5 +2,5 @@
 # https://mariadb.org/download/
 # deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
 # deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu noble main
-deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main
-# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu noble main
+deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu noble main
+# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu noble main

provision/core/nginx/sources-ubuntu-noble.list

@@ -0,0 +1,3 @@
+# Provides Nginx mainline
+deb https://nginx.org/packages/mainline/ubuntu/ noble nginx
+deb-src https://nginx.org/packages/mainline/ubuntu/ noble nginx

provision/core/node-ppa/sources-ubuntu-noble.list

@@ -0,0 +1,3 @@
+# Provides Node.js
+deb http://deb.nodesource.com/node_14.x noble main
+deb-src http://deb.nodesource.com/node_14.x noble main

provision/core/php/sources-ubuntu-noble.list

@@ -0,0 +1,3 @@
+# Provides PHP
+deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main
+deb-src https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main

provision/core/vvv/provision.sh

@@ -96,8 +96,21 @@ function shyaml_setup() {
   # Used for passing custom parameters to the bash provisioning scripts
   if [ ! -f /usr/local/bin/shyaml ]; then
     vvv_info " * Installing Shyaml for bash provisioning.."
-    sudo pip3 install wheel
-    sudo pip3 install shyaml
+
+    local OSVERSION_NUMBER=$(lsb_release lsb_release -sr)
+
+    # Ubuntu 24 making it hard to install pip packages, throwing externally-managed-environment error
+    # https://stackoverflow.com/a/75722775
+    if dpkg --compare-versions "${OSVERSION_NUMBER[@]}" ge "24.04"
+    then
+      # to make it available globally this is the last workaround, hopefully it doesn't break the system
+      # TODO: try to find a better alternative way to install
+      sudo pip3 install wheel --break-system-packages
+      sudo pip3 install shyaml --break-system-packages
+    else
+      sudo pip3 install wheel
+      sudo pip3 install shyaml
+    fi
   fi
 }
 export -f shyaml_setup

provision/core/vvv/sources-ubuntu-noble.list

@@ -0,0 +1,3 @@
+# VVV mirror packages
+# deb https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu noble main
+# deb-src https://ppa.launchpadcontent.net/varying-vagrant-vagrants/php/ubuntu noble main

provision/provision-helpers.sh

@@ -103,6 +103,7 @@ function network_check() {
     "https://getcomposer.org" # composer is used for lots of sites and provisioners
     "https://packagist.org" # Composer Packages
     "https://mariadb.gb.ssimn.org" # MariaDB mirror
+    "http://mariadb.mirrors.ovh.net" # MariaDB mirror[ovh]
     "http://ports.ubuntu.com/"
     "https://nginx.org/packages/mainline/"
   )
@@ -731,3 +732,13 @@ function vvv_search_replace_in_file() {
   fi
 }
 export -f vvv_search_replace_in_file
+
+# @description Identify the service name for the MySQL service via /etc/init.d/ contents
+# TODO: test on virtualbox
+function vvv_get_mysql_service_name() {
+  if [ ! -f /etc/init.d/mariadb ]; then
+    echo "mysql"
+  fi
+  echo "mariadb"
+}
+export -f vvv_get_mysql_service_name