Update Docker Image to Ubuntu 24.04 ( Noble ) #2739

pentatonicfunk · 2024-10-20T02:25:22Z

Update docker image to use Ubuntu 24.04 ( noble )
-- Add missing noble repository list
-- Hacky fix of pip shyaml install on Ubuntu 24.04: see https://pimylifeup.com/python-externally-managed-environment/
Update mariadb repo to OVH ( only on focal and noble ): see unable to provision using several providers on Arm64/Apple Silicon M3 chip #2727 (comment)
Introduce vvv_get_mysql_service_name, in attempt to improve mariadb vs mysql service inconsistency
-- Unable to replicate the service name inconsistency, but it happened. ref: Slack #docker
Minor output copy fixes / improvements
Introduce customizable general.php_cli_version
-- It does have use case for me personally at least
-- Generally this provides user with better control of PHP CLI version rather than meddling / replicating vvv_restore_php_default to change PHP CLI version: https://github.com/Varying-Vagrant-Vagrants/varyingvagrantvagrants.org/blob/main/docs/en-US/adding-a-new-site/changing-php-version.md?plain=1#L83

Checks

I've updated the changelog.
I've tested this PR: Partially
This PR is for the develop branch not the stable branch.
This PR is complete and ready for review.

Note on testing:

Currently i only have linux host testing machine. I've tested with Docker provider, and it went okay, logs attached
Tried using Virtualbox, but it keeps timing out / error

Timed out while waiting for the machine to boot. This means that
Vagrant was unable to communicate with the guest machine within
the configured ("config.vm.boot_timeout" value) time period.

If you look above, you should be able to see the error(s) that
Vagrant had when attempting to connect to the machine. These errors
are usually good hints as to what may be wrong.

If you're using a custom box, make sure that networking is properly
working and you're able to connect to the machine. It is a common
problem that networking isn't setup properly in these boxes.
Verify that authentication configurations are also setup properly,
as well.

If the box appears to be booting properly, you may want to increase
the timeout ("config.vm.boot_timeout") value.

If anyone can help testing it, please

Changelogs:

Please advise

- wildcard

…-Vagrants/develop v3.11 PR

…-Vagrants/develop 3.11.2 on stable

…-Vagrants/develop 3.12 stable

…-Vagrants/develop v3.1.2 stable

# Conflicts: # provision/core/git/provision.sh

…beta

- Add OVH url in hosts_to_test ( keep the mariadb.gb.ssimn.org )

- Better messages

update-docs · 2024-10-20T02:25:26Z

Thanks for opening this pull request! Make sure CHANGELOG.md gets updated with this change, additionally any docs that need updated can be found at https://github.com/Varying-Vagrant-Vagrants/varyingvagrantvagrants.org

GitHub
GitHub - Varying-Vagrant-Vagrants/varyingvagrantvagrants.org: The VVV docs and website
The VVV docs and website. Contribute to Varying-Vagrant-Vagrants/varyingvagrantvagrants.org development by creating an account on GitHub.

tomjn · 2024-10-20T11:13:30Z

@pentatonicfunk how much of this can we split into separate PRs? Upgrading Ubuntu isn't a small task but adding the sources could be done and released pretty quickly to simplfy merging. Likewise some of the other changes are useful and quick to test on their own.

I am mindful that upgrading Ubuntu the last time resulted in some weirdness that needed investigation.

Also, the service changes, I was thinking of changing how services are restarted to use a VVV specific function to insulate against service and systemctl since there's a lot of duplication going on

pentatonicfunk · 2024-10-20T12:22:43Z

i will try to cherry picks into separate branches next week.

tomjn · 2024-10-20T15:14:52Z

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


note that by itself this would lead to 8.2 being installed then VVV failing once it restored PHP default as the newly set version wouldn't be installed. It also wouldn't change the dashboard and other sites which would still be configured to 8.2 as the default upstream. There's a lot more work needed to support this, and previously we've added the php: ... parameter to sites to make it easier to wrangle since most requests to change the default PHP were to fix the provisioner and CLI using the wrong PHP to run stuff which php:.. fixes

that is valid unintended effect that i didn't foresee. so i think its better to revert this change as it could break things rather than do good.

I get why people want it, but I want to make sure it's not an X Y solution as it'll get abused and has lots of gotchas, I'm curious about your use case though

I'm also mindful we will want a generic PHP provisioner at some point with templated PHP ini files etc rather than a dedicated hardcoded provisioner for each

my use case maybe not that generic and/or critical enough, but here it is

im trying to match php version in WP CLI to the one that i have on my production server, that way when i do test my script locally ( in vvv ), it ensure script run successfully in that specific php version. Changing PHP version for WP CLI in runtime is not that straightforward, so having the PHP CLI to be statically same with my production server, would avoid me make a wrong judgement.

the solution that i offered here, maybe just too far and/or not actually the solution that i actually need. in my other fork, i have this script in homebin: vvv_change_php_default and that was enough.

#!/bin/bash DEFAULTPHP=${1:-"7.4"} echo " * Changing the default PHP CLI version ( ${DEFAULTPHP} )" update-alternatives --set php "/usr/bin/php${DEFAULTPHP}" update-alternatives --set phar "/usr/bin/phar${DEFAULTPHP}" update-alternatives --set phar.phar "/usr/bin/phar.phar${DEFAULTPHP}" update-alternatives --set phpize "/usr/bin/phpize${DEFAULTPHP}" update-alternatives --set php-config "/usr/bin/php-config${DEFAULTPHP}" echo " * Change completed"

i just assumed since its similar code with vvv_restore_php_default, then maybe having it in that script would be better, which is wrong assumption obviously.

hmmm, something I wanted to do was make it auto-switch PHP based on the folder you were in, but it's not as straightforward especially if you've multiple sessions. There's a ticket to add the PHP version into the prompt so it's more obvious for people who aren't aware of all of this and mistakenly run in the wrong version they expect

this also reverted, as you've mentioned that it can cause issues down the road. and my use case is too specific to be having this in default config

tomjn · 2024-10-20T15:15:30Z

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'


does this trigger a VM rebuild for exsting Ubuntu 22 instances that upgrade?

good question, i dont know. it would be vagrant territory, no ? the decision whether docker container need rebuild or not would be based on what vagrant flow will be issued. in any case better to test it, i'll try to test

main concerns is if vagrant would kick up a fuss about mismatching images or if it would discard the container ( and the database + data ) to create a new 24 container

tomjn · 2024-10-20T15:16:12Z

config/homebin/vagrant_provision

+if sudo service "${mysql_service_name[@]}" status > /dev/null; then
+    sudo service "${mysql_service_name[@]}" restart
+  else
+    sudo service "${mysql_service_name[@]}" start
+  fi


I'd like to wrap all this in a helper function as we have similar stuff in the vagrant up and provision hooks as well as lots of provisioners and it's super repetitive

provision/core/mariadb/provision.sh

tomjn · 2024-10-20T15:18:11Z

provision/core/vvv/provision.sh

-    sudo pip3 install wheel
-    sudo pip3 install shyaml
+
+    local OSVERSION_NUMBER=$(lsb_release lsb_release -sr)


shellcheck will probably flag this and a few other things, it should be something like this:

Suggested change

local OSVERSION_NUMBER=$(lsb_release lsb_release -sr)

local OSVERSION_NUMBER

OSVERSION_NUMBER=$(lsb_release lsb_release -sr)

huh, this adjustments causing error for some reason

lsb_release: error: No arguments are permitted

https://github.com/Varying-Vagrant-Vagrants/VVV/actions/runs/11580749924/job/32239965581?pr=2739

reverted it to the original changes. the checks / linting seems to be fine: https://github.com/Varying-Vagrant-Vagrants/VVV/actions/runs/11581054132/job/32240928199?pr=2739
and we already doing these kind of local syntax previously: https://github.com/Varying-Vagrant-Vagrants/VVV/blob/develop/provision/core/vvv/provision.sh#L62-L64

ah I think the problem is a mistake on my part, lsb_release vs lsb_release lsb_release

tomjn · 2024-10-20T15:18:55Z

provision/core/vvv/provision.sh

+    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


is there somewhere I can read up on why this happens or where the fix came from? Would be good to have it in the comments, I've created a separate PR for shyaml fixes

https://peps.python.org/pep-0668/

https://pimylifeup.com/python-externally-managed-environment/

https://stackoverflow.com/questions/75608323/how-do-i-solve-error-externally-managed-environment-every-time-i-use-pip-3/75722775#75722775

tomjn · 2024-10-20T15:19:41Z

provision/provision-helpers.sh

@@ -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


in the past both have worked and been alias'd somehow

that wasn't something we did though, but an observation of how it came out the box

exactly yea, it seems how mariadb installer works ( not vvv ). i am thinking maybe the mariadb vs mysql thing is a glitch that i experienced one time, as i can't replicate it again. my last provision, it gets correctly mariadb.
i will do 1 more tests, and maybe revert the changes mariadb vs mysql service thing from this PR

so i've reverted these, it seems the issue is something in my lab machine.

i've been testing the mariadb with multiple vagrant destroy and vagrant up --provision, its consistently working fine with mariadb

vagrant@vvv:~$ sudo service mariadb status * /usr/bin/mariadb-admin Ver 10.0 Distrib 10.11.9-MariaDB, for debian-linux-gnu on x86_64 Copyright (c) 2000, 2018, Oracle, MariaDB Corporation Ab and others. Server version 10.11.9-MariaDB-ubu2404 Protocol version 10 Connection Localhost via UNIX socket UNIX socket /run/mysqld/mysqld.sock Uptime: 12 sec Threads: 1 Questions: 63 Slow queries: 0 Opens: 33 Open tables: 26 Queries per second avg: 5.250

Co-authored-by: Tom J Nowell <[email protected]>

This reverts commit c705505.

This reverts commit 87ba465.

This reverts commit c798cef.

This reverts commit 30b8230.

This reverts commit bbcf60d.

This reverts commit 4c38733.

…beta # Conflicts: # provision/provision-helpers.sh

…r-provider # Conflicts: # provision/core/mariadb/provision.sh

…r-provider

This reverts commit 3e6aec5.

…r-provider

tomjn and others added 23 commits September 10, 2022 11:55

Merge branch 'develop' into stable

5b3aa20

Attempt to fix git safe dir issue

dd9691e

- wildcard

Fix git safe.directory script

312aed8

Merge pull request Varying-Vagrant-Vagrants#2652 from Varying-Vagrant…

d28080c

…-Vagrants/develop v3.11 PR

Merge pull request Varying-Vagrant-Vagrants#2669 from Varying-Vagrant…

3b367ce

…-Vagrants/develop 3.11.2 on stable

Merge pull request Varying-Vagrant-Vagrants#2684 from Varying-Vagrant…

aee9a69

…-Vagrants/develop 3.12 stable

Merge branch 'develop' into stable

f3ef893

Merge pull request Varying-Vagrant-Vagrants#2720 from Varying-Vagrant…

e0dad5d

…-Vagrants/develop v3.1.2 stable

Merge remote-tracking branch 'upstream/stable' into docker-provider-beta

12be863

# Conflicts: # provision/core/git/provision.sh

Merge remote-tracking branch 'upstream/develop' into docker-provider-…

cfd11ad

…beta

Update mariadb repo to OVH for ubuntu focal

3a9de05

- Add OVH url in hosts_to_test ( keep the mariadb.gb.ssimn.org )

Use mysql as service name in docker

4c38733

Use mysql as service name in docker -- vagrant_up

bbcf60d

Attempt to dynamically get mysql service name

30b8230

Fix inverted vvv_get_mysql_service_name

c798cef

Fix syntax issue

87ba465

- Better messages

More messages fix

fb41956

Attempt to add more Ubuntu noble repo list

80275ed

Dummy vvv sources list for noble

8d9dd89

Attempt to solve shyaml pip install

237b447

Fix dpkg version compare relation arg

3dc8769

Allow custom PHP CLI version

c705505

Use ubuntu 24.04 as default image for docker provider

e85f98a

Revert git safe dir setup

c72778f

pentatonicfunk requested a review from tomjn October 20, 2024 02:44

This was referenced Oct 20, 2024

Shyaml Ubuntu 24 fixes #2740

Open

MariaDB OVH Mirror #2741

Merged

tomjn reviewed Oct 20, 2024

View reviewed changes

provision/core/mariadb/provision.sh Outdated Show resolved Hide resolved

tomjn reviewed Oct 20, 2024

View reviewed changes

pentatonicfunk and others added 14 commits October 21, 2024 12:43

Fix comments copy in provision/core/mariadb/provision.sh

33db168

Co-authored-by: Tom J Nowell <[email protected]>

Update Changelog

227a983

Revert "Allow custom PHP CLI version"

2367444

This reverts commit c705505.

Revert "Fix syntax issue"

6809d61

This reverts commit 87ba465.

Revert "Fix inverted vvv_get_mysql_service_name"

2d42d49

This reverts commit c798cef.

Revert "Attempt to dynamically get mysql service name"

754ac15

This reverts commit 30b8230.

Revert "Use mysql as service name in docker -- vagrant_up"

c544d5a

This reverts commit bbcf60d.

Revert "Use mysql as service name in docker"

196887e

This reverts commit 4c38733.

Merge remote-tracking branch 'upstream/develop' into docker-provider-…

d224835

…beta # Conflicts: # provision/provision-helpers.sh

Merge remote-tracking branch 'origin/docker-provider-beta' into docke…

060f8a0

…r-provider # Conflicts: # provision/core/mariadb/provision.sh

Minor script adjustment Varying-Vagrant-Vagrants#2739 (comment)

3e6aec5

Merge remote-tracking branch 'origin/docker-provider-beta' into docke…

ebf8675

…r-provider

Revert "Minor script adjustment Varying-Vagrant-Vagrants#2739 (comment)"

a6b4f7f

This reverts commit 3e6aec5.

Merge remote-tracking branch 'origin/docker-provider-beta' into docke…

0094cb0

…r-provider

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Docker Image to Ubuntu 24.04 ( Noble ) #2739

Update Docker Image to Ubuntu 24.04 ( Noble ) #2739

pentatonicfunk commented Oct 20, 2024

update-docs bot commented Oct 20, 2024 •

edited by unfurl-links bot

Loading

tomjn commented Oct 20, 2024

pentatonicfunk commented Oct 20, 2024

tomjn Oct 20, 2024

pentatonicfunk Oct 21, 2024

tomjn Oct 21, 2024

tomjn Oct 21, 2024

pentatonicfunk Oct 21, 2024

tomjn Oct 21, 2024

pentatonicfunk Oct 29, 2024

tomjn Oct 20, 2024

pentatonicfunk Oct 21, 2024

tomjn Oct 21, 2024

tomjn Oct 20, 2024

tomjn Oct 20, 2024

pentatonicfunk Oct 29, 2024

pentatonicfunk Oct 29, 2024

pentatonicfunk Oct 29, 2024

tomjn Oct 29, 2024

tomjn Oct 20, 2024

pentatonicfunk Oct 21, 2024

tomjn Oct 20, 2024

tomjn Oct 20, 2024

pentatonicfunk Oct 21, 2024

pentatonicfunk Oct 29, 2024

	local OSVERSION_NUMBER=$(lsb_release lsb_release -sr)
	local OSVERSION_NUMBER
	OSVERSION_NUMBER=$(lsb_release lsb_release -sr)

Update Docker Image to Ubuntu 24.04 ( Noble ) #2739

Are you sure you want to change the base?

Update Docker Image to Ubuntu 24.04 ( Noble ) #2739

Conversation

pentatonicfunk commented Oct 20, 2024

Checks

update-docs bot commented Oct 20, 2024 • edited by unfurl-links bot Loading

tomjn commented Oct 20, 2024

pentatonicfunk commented Oct 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

update-docs bot commented Oct 20, 2024 •

edited by unfurl-links bot

Loading