Merge branch 'develop' into stable

.gitattributes

@@ -6,3 +6,4 @@
 *.gif binary
 *.jpg binary
 *.jpeg binary
+*.gpg binary

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -94,6 +94,7 @@ body:
              - 'VirtualBox 5'
              - 'Parallels (Intel)'
              - 'Parallels (Apple Silicon/Arm)'
+             - 'Docker'
              - 'Hyper-V'
              - 'VMWare'
              - 'Other'

.github/workflows/vvv-provisioning.yml

@@ -21,7 +21,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       # Make Symlinks
       - name: Create Vagrant Like Environment
@@ -104,127 +104,8 @@ jobs:
           MYGID=$(id -g -n)
           sudo chown -R $MYUID:$MYGID "$GITHUB_WORKSPACE/log"
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: ${{ always() }}
         with:
           name: logs-on-docker
           path: "${{ github.workspace }}/log"
-
-  # This workflow contains a single job called "build"
-  on-stable:
-    name: MacOS 10.15 Stable Reprovision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-        with:
-          ref: stable
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v2
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (stable)
-        run: vagrant up
-
-      - uses: actions/checkout@v2
-        with:
-          clean: false
-
-      - name: vagrant up (current branch)
-        run: vagrant up --provision
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs-on-stable
-          path: "${{ github.workspace }}/log"
-
-  on-develop:
-    name: MacOS 10.15 Develop Reprovision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-        with:
-          ref: develop
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v2
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (develop)
-        run: vagrant up
-
-      - uses: actions/checkout@v2
-        with:
-          clean: false
-
-      - name: vagrant up (current branch)
-        run: vagrant up --provision
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs-on-develop
-          path: "${{ github.workspace }}/log"
-
-  on-clean:
-    name: MacOS 10.15 Clean Provision
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - name: Cache Vagrant boxes
-        uses: actions/cache@v2
-        with:
-          path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('Vagrantfile') }}
-          restore-keys: |
-            ${{ runner.os }}-vagrant-
-
-      - name: install goodhosts
-        run: vagrant plugin install --local
-
-      - name: vagrant up (current branch)
-        run: vagrant up
-
-      - name: tests
-        run: provision/tests/macos-tests.sh
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs-on-clean
-          path: "${{ github.workspace }}/log"

CHANGELOG.md

@@ -6,10 +6,37 @@ permalink: /docs/en-US/changelog/
 
 # Changelog
 
-## 3.12 ( 2023 August 3rd )
+## 3.13.1 ( 2024 June 16th )
 
 ### Enhancements
 
+* Switched the default PHP from v7.4 to v8.2 and ~default Node from v14 to v16~ ( #2690 )
+* Use Node 20 as the default version to match WP and Gutenberg ( #2696 )
+* WP Coding standards v3 ( #2688 )
+* VIP Coding standards v3 ( #2688 )
+* Better error messages with links to docs when trying to use a PHP version that isn't installed ( #2689 )
+* Opted out of Dotnet package telemetry ( #2689 )
+* Replace references to the Squizlab PHPCS with that from the PHPCS Standards org ( #2692 )
+* Better PHP Debug mod switching outputs and checks ( #2702 )
+* PHP Info and Xdebug info pages now state their versions ( #2702 )
+
+### Maintenance
+
+* Switch the Parallels Arm64 box from `mpasternak/focal64-arm` to `bento/ubuntu-20.04-arm64` to match x86 boxes ( #2695 )
+
+### Bug Fixes
+
+* The host file inside the VM was only adding sites with `127.0.0.1` addresses, now it adds the IPVv6 `::1` too ( #2689 )
+* Fixes for hosts file cleanup ( #2708 )
+* Removed old MacOS PR workflows, no runners available ( #2698 )
+* Replace an outdated Nginx signing key ( #2710 )
+* Don't sync clocks when using the docker provider ( #2711 )
+
+## 3.12.1 ( 2023 August 3rd )
+
+### Enhancements
+
+* Monolithic docker beta support ( #2632 )
 * Added the GMP PHP extension to the default PHP installation ( #2676 )
 
 ### Maintenance

README.md

@@ -8,7 +8,7 @@ _VVV stands for Varying Vagrant Vagrants._
 
 ## How To Use
 
-To use it, download and install [Vagrant](https://www.vagrantup.com) and [VirtualBox](https://www.virtualbox.org/). Then, clone this repository and run:
+To use it, download and install [Vagrant](https://www.vagrantup.com) and a provider such as [VirtualBox](https://www.virtualbox.org/), Docker, or Parallels Pro. Then, clone this repository and run:
 
 ```shell
 vagrant plugin install --local

Vagrantfile

@@ -9,6 +9,7 @@ Vagrant.require_version '>= 2.2.4'
 require 'yaml'
 require 'fileutils'
 require 'pathname'
+require 'socket'
 
 def sudo_warnings
   red = "\033[38;5;9m" # 124m"
@@ -216,9 +217,9 @@ defaults['memory'] = 2048
 defaults['cores'] = 1
 defaults['provider'] = 'virtualbox'
 
-# if Arm default to parallels
+# if Arm default to docker
 if Etc.uname[:version].include? 'ARM64'
-  defaults['provider'] = 'parallels'
+  defaults['provider'] = 'docker'
 end
 
 # This should rarely be overridden, so it's not included in the config/default-config.yml file.
@@ -446,7 +447,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # this seems to be the most reliable way to detect whether or not we're
     # running under ARM64.
     if Etc.uname[:version].include? 'ARM64'
-      override.vm.box = 'mpasternak/focal64-arm'
+      override.vm.box = 'bento/ubuntu-20.04-arm64'
     end
   end
 
@@ -461,6 +462,19 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     override.vm.box = 'bento/ubuntu-20.04'
   end
 
+  # Docker use image.
+  config.vm.provider :docker do |d, override|
+    d.image = 'pentatonicfunk/vagrant-ubuntu-base-images:20.04'
+    d.has_ssh = true
+    d.ports =  [ "80:80" ] # HTTP
+    d.ports += [ "443:443" ] # HTTPS
+    d.ports += [ "3306:3306" ] # MySQL
+    d.ports += [ "8025:8025" ] # Mailhog
+
+    ## Fix goodhosts aliases format for docker
+    override.goodhosts.aliases = { '127.0.0.1' => vvv_config['hosts'], '::1' => vvv_config['hosts'] }
+  end
+
   # Virtualbox.
   config.vm.provider :virtualbox do |_v, override|
     # Default Ubuntu Box
@@ -514,7 +528,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Access to the guest machine is only available to your local host. To provide access to
   # other devices, a public network should be configured or port forwarding enabled.
   #
-  # Note: If your existing network is using the 192.168.50.x subnet, this default IP address
+  # Note: If your existing network is using the 192.168.56.x subnet, this default IP address
   # should be changed. If more than one VM is running through VirtualBox, including other
   # Vagrant machines, different subnets should be used for each.
   #
@@ -884,7 +898,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   if config.vagrant.plugins.include? 'vagrant-goodhosts'
     config.goodhosts.aliases = vvv_config['hosts']
     config.goodhosts.remove_on_suspend = true
-    
+
     # goodhosts already disables clean by default, but lets enforce this at both ends
     config.goodhosts.disable_clean = true
   elsif config.vagrant.plugins.include? 'vagrant-hostsmanager'

config/default-config.yml

@@ -36,7 +36,7 @@ sites:
     skip_provisioning: false
     description: "A standard WP install, useful for building plugins, testing things, etc"
     repo: https://github.com/Varying-Vagrant-Vagrants/custom-site-template.git
-    php: 7.4 # change the PHP version to use for the provision and nginx
+    #php: 8.0 # change the PHP version to use for the provision and nginx
     custom:
       # locale: it_IT
       delete_default_plugins: true
@@ -87,13 +87,10 @@ extensions:
     #- mongodb # needed for Tideways/XHGui
     #- tideways # PHP profiling tool, also installs xhgui check https://varyingvagrantvagrants.org/docs/en-US/references/tideways-xhgui/
     #- nvm # Node Version Manager
-    #- php56
-    #- php70
-    #- php71
-    #- php72
-    #- php73
     #- php74
     #- php80
+    #- php81
+    #- php83
 
 # vm_config controls how Vagrant provisions the virtual machine, and can be used to
 # increase the memory given to VVV and the number of CPU cores.
@@ -125,6 +122,7 @@ vm_config:
   # provider: hyperv
   # provider: parallels
   # provider: vmware_desktop
+  # provider: docker
 
 # General VVV options
 general: