Skip to content

Commit 060f8a0

Browse files
pentatonicfunkpentatonicfunk
committed
Merge remote-tracking branch 'origin/docker-provider-beta' into docker-provider
# Conflicts: # provision/core/mariadb/provision.sh
2 parents 33db168 + d224835 commit 060f8a0

12 files changed

+37
-62
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ permalink: /docs/en-US/changelog/
1414
* Provisioner/Hook timings now show milliseconds ( #2735 )
1515
* Added a `skip_site_provisioner_update` option to prevent site provisioners being overwritten by updates ( #2733 )
1616
* Only start services that aren't running in post-up scripts ( #2732 )
17+
* Upgraded Ubuntu from 20.04 to 24.04 for docker provider ( #2739 )
1718

1819
### Bug Fixes
1920

2021
* VVV will check if Parallels is installed before defaulting to docker on Arm64/Apple Silicon due to issues with Docker detection ( #2722 )
2122
* Switched from Rackspace to Starburst services for MariaDB mirrors ( #2728 )
23+
* Switched from Starburst to OVH for MariaDB mirrors ( #2741 )
2224
* Fixes for service starts under some situations in Docker ( #2732 )
2325
* Fixed an issue with trailing slashes and site provisioners introduced in an earlier version (#2731)
2426

‎config/default-config.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,6 @@ general:
146146
# GitHub token to use from composer
147147
#github_token: xxxxxx
148148

149-
# Set the default version of PHP CLI
150-
# php_cli_version: 8.2
151-
152149
# Settings for the vagrant plugins supported by VVV
153150
vagrant-plugins:
154151
disksize: 10GB # requires the disk size vagrant plugin

‎config/homebin/vagrant_provision‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ source /srv/provision/provision-helpers.sh
1616

1717
vvv_success " ▷ Post provision script"
1818

19-
mysql_service_name=$(vvv_get_mysql_service_name)
20-
2119
if [[ -f /srv/config/homebin/vagrant_provision_custom ]]; then
2220
vvv_info " * Custom vagrant provision script found, executing vagrant_provision_custom"
2321
/srv/config/homebin/vagrant_provision_custom
@@ -31,11 +29,11 @@ else
3129
fi
3230

3331
vvv_info " * Restarting MariaDB service"
34-
if sudo service "${mysql_service_name[@]}" status > /dev/null; then
35-
sudo service "${mysql_service_name[@]}" restart
36-
else
37-
sudo service "${mysql_service_name[@]}" start
38-
fi
32+
if sudo service mariadb status > /dev/null; then
33+
sudo service mariadb restart
34+
else
35+
sudo service mariadb start
36+
fi
3937

4038
if [ ! -f /.dockerenv ]; then
4139
if [ -x "$(command -v ntpdate)" ]; then

‎config/homebin/vagrant_up‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ TEARS="${CYAN}░${RED}"
2222
EYE="${CYAN}█${RED}"
2323
URL="\033[4;38;5;3m"
2424

25-
mysql_service_name=$(vvv_get_mysql_service_name)
26-
2725
if [[ -f /srv/config/homebin/vagrant_up_custom ]]; then
2826
vvv_info " * Custom vagrant up script found, executing vagrant_up_custom"
2927
/srv/config/homebin/vagrant_up_custom
@@ -39,10 +37,9 @@ if ! sudo service nginx status > /dev/null; then
3937
sudo service nginx start
4038
fi
4139

42-
43-
vvv_info " * Starting MariaDB service"
44-
if ! sudo service "${mysql_service_name[@]}" status > /dev/null; then
45-
sudo service "${mysql_service_name[@]}" start
40+
if ! sudo service mariadb status > /dev/null; then
41+
vvv_info " * Starting MariaDB service"
42+
sudo service mariadb start
4643
fi
4744

4845
vvv_info " * Checking PHP-FPM Services"

‎config/homebin/vvv_restore_php_default‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Load config.yml
4-
VVV_CONFIG=/srv/config/default-config.yml
5-
if [[ -f /srv/config/config.yml ]]; then
6-
VVV_CONFIG=/srv/config/config.yml
7-
fi
8-
9-
DEFAULTPHP=$(cat ${VVV_CONFIG} | shyaml -q get-value general.php_cli_version "8.2")
3+
DEFAULTPHP="8.2"
104
php_version=$(readlink -f /usr/bin/php)
115
if [[ $php_version != *"${DEFAULTPHP}"* ]]; then
126
echo " * Restoring the default PHP CLI version ( ${DEFAULTPHP} )"

‎provision/core/mariadb/provision.sh‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@ function mysql_setup() {
125125
vvv_info " * Copied /srv/provision/core/mariadb/config/debian.cnf to /etc/mysql/debian.cnf"
126126

127127
# Due to systemd dependencies, in docker, mysql service is not auto started
128-
# also docker isn't systemd based, so the service name is different: see: https://mariadb.com/kb/en/systemd/ vs https://mariadb.com/kb/en/sysvinit/
129-
mysql_service_name=$(vvv_get_mysql_service_name)
130128
vvv_info " * Ensuring MariaDB service is started"
131-
service "${mysql_service_name[@]}" status > /dev/null || service "${mysql_service_name[@]}" start
129+
service mariadb status > /dev/null || service mariadb start
132130

133131
if [ ! -f /.dockerenv ]; then
134132
check_mysql_root_password
@@ -137,19 +135,19 @@ function mysql_setup() {
137135
# MySQL gives us an error if we restart a non running service, which
138136
# happens after a `vagrant halt`. Check to see if it's running before
139137
# deciding whether to start or restart.
140-
if service "${mysql_service_name[@]}" status > /dev/null; then
138+
if service mariadb status > /dev/null; then
141139
vvv_info " * Restarting the mariadb service"
142-
if ! service "${mysql_service_name[@]}" restart; then
140+
if ! service mariadb restart; then
143141
vvv_error " * Restarting the MariaDB failed! Fetching service status."
144-
service "${mysql_service_name[@]}" status
142+
service mariadb status
145143
exit 1
146144
fi
147145
else
148-
vvv_info " * Starting mariadb service"
149-
service "${mysql_service_name[@]}" start
150-
if ! service "${mysql_service_name[@]}" start; then
146+
vvv_info " * Restarting mariadb service"
147+
service mariadb start
148+
if ! service mariadb start; then
151149
vvv_error " * Starting MariaDB failed! Fetching service status."
152-
service "${mysql_service_name[@]}" status
150+
service mariadb status
153151
exit 1
154152
fi
155153
fi

‎provision/core/mariadb/sources-debian-bookworm.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bookworm main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bookworm main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bookworm main

‎provision/core/mariadb/sources-debian-bullseye.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian bullseye main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian bullseye main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian bullseye main

‎provision/core/mariadb/sources-debian-buster.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/debian buster main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/debian buster main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/debian buster main

‎provision/core/mariadb/sources-ubuntu-bionic.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# https://mariadb.org/download/
33
# deb.mariadb.org is a dynamic mirror if your preferred mirror goes offline. See https://mariadb.org/mirrorbits/ for details.
44
# deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://deb.mariadb.org/10.11/ubuntu bionic main
5-
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main
6-
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mariadb.gb.ssimn.org/repo/10.11/ubuntu bionic main
5+
deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main
6+
# deb-src [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] http://mariadb.mirrors.ovh.net/MariaDB/repo/10.11/ubuntu bionic main

0 commit comments

Comments
 (0)