docs: standardize capitalization

.buildkite/macos-colima.yml

@@ -0,0 +1,21 @@
+# Colima with qemu and sshfs
+# See https://buildkite.com/ddev/macos-colima/settings/repository
+# Runs on master and PRs, including forked PRs
+
+  - command: ".buildkite/test.sh"
+    plugins:
+      - docker-login#v2.1.0:
+          username: druddockerpullaccount
+          password-env: DOCKERHUB_PULL_PASSWORD
+    agents:
+      - "os=macos"
+      - "colima=true"
+      - "architecture=arm64"
+    env:
+      BUILDKITE_CLEAN_CHECKOUT: true
+      BUILDKITE_BUILD_PATH: ~/tmp/buildkite_builds
+      BUILDKIT_PROGRESS: plain
+      DDEV_TEST_SHARE_CMD: "false"
+      DDEV_RUN_GET_TESTS: "false"
+      DOCKER_TYPE: "colima"
+    parallelism: 1

.buildkite/macos-colima_vz.yml

@@ -0,0 +1,23 @@
+# Colima with VZ and virtiofs
+# See https://buildkite.com/ddev/macos-colima-vz/settings/repository
+# Runs on master and PRs, including forked PRs
+
+  - command: ".buildkite/test.sh"
+    plugins:
+      - docker-login#v2.1.0:
+          username: druddockerpullaccount
+          password-env: DOCKERHUB_PULL_PASSWORD
+    agents:
+      - "os=macos"
+      - "colima=true"
+      - "colima_vz=true"
+      - "architecture=arm64"
+    #branches: "master"
+    env:
+      BUILDKITE_CLEAN_CHECKOUT: true
+      BUILDKITE_BUILD_PATH: ~/tmp/buildkite_builds
+      BUILDKIT_PROGRESS: plain
+      DDEV_TEST_SHARE_CMD: "false"
+      DDEV_RUN_GET_TESTS: "false"
+      DOCKER_TYPE: "colima_vz"
+    parallelism: 1

.buildkite/macos-docker-desktop-amd64.yml

@@ -1,3 +1,7 @@
+# Docker Desktop on macOS amd64
+# See https://buildkite.com/ddev/ddev-macos-amd64-mutagen/settings/repository
+# Runs on master only
+
   - command: ".buildkite/test.sh"
     plugins:
       - docker-login#v2.1.0:
@@ -7,6 +11,7 @@
       - "os=macos"
       - "docker-desktop=true"
       - "architecture=amd64"
+    branches: "master"
     env:
       BUILDKITE_CLEAN_CHECKOUT: true
       BUILDKITE_BUILD_PATH: ~/tmp/buildkite_builds

.buildkite/macos-docker-desktop-arm64.yml

@@ -1,3 +1,7 @@
+# Docker Desktop on macOS arm64
+# See https://buildkite.com/ddev/ddev-macos-arm64-mutagen/settings/repository
+# Runs on master and PRs, including forked PRs
+
   - command: ".buildkite/test.sh"
     plugins:
       - docker-login#v2.1.0:

.buildkite/macos-lima.yml

@@ -0,0 +1,22 @@
+ # macOS Lima on arm64 with VZ/Virtiofs
+ # Experimental, not yet enabled
+ # See https://buildkite.com/ddev/macos-lima/settings/repository
+
+  - command: ".buildkite/test.sh"
+    plugins:
+      - docker-login#v2.1.0:
+          username: druddockerpullaccount
+          password-env: DOCKERHUB_PULL_PASSWORD
+    agents:
+      - "os=macos"
+      - "lima=true"
+      - "architecture=arm64"
+    branches: "none"
+    env:
+      BUILDKITE_CLEAN_CHECKOUT: true
+      BUILDKITE_BUILD_PATH: ~/tmp/buildkite_builds
+      BUILDKIT_PROGRESS: plain
+      DDEV_TEST_SHARE_CMD: "false"
+      DDEV_RUN_GET_TESTS: "false"
+      DOCKER_TYPE: "lima"
+    parallelism: 1

.buildkite/macos-orbstack.yml

@@ -1,3 +1,7 @@
+# Orbstack on macOS arm64
+# See https://buildkite.com/ddev/macos-orbstack/settings/repository
+# Runs on master and PRs, including forked PRs
+
   - command: ".buildkite/test.sh"
     plugins:
       - docker-login#v2.1.0:
@@ -7,7 +11,7 @@
       - "os=macos"
       - "orbstack=true"
       - "architecture=arm64"
-    #branches: "master"
+#    branches: "master"
     env:
       BUILDKITE_CLEAN_CHECKOUT: true
       BUILDKITE_BUILD_PATH: ~/tmp/buildkite_builds

.buildkite/macos-rancher-desktop.yml

@@ -1,3 +1,7 @@
+# Rancher Desktop on macOS arm64
+# See https://buildkite.com/ddev/macos-rancher-desktop/settings/repository
+# Runs on ddev/ddev only, not on PRs
+
   - command: ".buildkite/test.sh"
     plugins:
       - docker-login#v2.1.0:

.buildkite/nfstest.sh

@@ -4,22 +4,11 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-function cleanup {
-    docker volume rm nfstest >/dev/null || true
-}
-trap cleanup EXIT
+NFS_PROJECT_DIR=~/tmp/ddev-nfs-test
+mkdir -p ${NFS_PROJECT_DIR} || true && cd ${NFS_PROJECT_DIR}
 
-mkdir -p ~/.ddev
+ddev config --auto
+ddev debug nfsmount
+ddev delete -Oy
 
-# Handle new macOS Catalina /System/Volumes/Data share path.
-share=${HOME}/.ddev
-if [ -d "/System/Volumes/Data${HOME}/.ddev" ] ; then
-    share="/System/Volumes/Data${HOME}/.ddev"
-fi
-
-# Find host.docker.internal name using host-docker-internal.sh script
-hostDockerInternal=$($(dirname $0)/../scripts/host-docker-internal.sh)
-
-docker volume create --driver local --opt type=nfs --opt o=addr=${hostDockerInternal},hard,nolock,rw --opt device=:${share} nfstest >/dev/null
-docker run -t --rm -v nfstest:/tmp/nfs busybox:stable ls //tmp/nfs >/dev/null
 echo "nfsd seems to be set up ok"

.buildkite/sanetestbot.sh

@@ -51,8 +51,8 @@ if command -v ddev >/dev/null && version_gt ${MIN_DDEV_VERSION} ${CURRENT_DDEV_V
   exit 4
 fi
 
-# Skip nfs check on linux, as we won't run nfs there
-if [ ${OSTYPE%%-gnu} != "linux" ]; then
+# Skip nfs check on linux/lima, as we won't run nfs there
+if [ ${OSTYPE%%-gnu} != "linux" ] && [ ${DOCKER_TYPE:-nothing} != "lima" ]; then
   $(dirname $0)/nfstest.sh
 fi
 

.buildkite/test.sh

@@ -1,37 +1,75 @@
 #!/bin/bash
 # This script is used to build ddev/ddev using buildkite
 
+set -eu -o pipefail
+
 export PATH=$PATH:/home/linuxbrew/.linuxbrew/bin
 
-# GOTEST_SHORT=8 means drupal9
-export GOTEST_SHORT=8
+# GOTEST_SHORT=12 means drupal10
+export GOTEST_SHORT=12
+
+export DOCKER_SCAN_SUGGEST=false
+export DOCKER_SCOUT_SUGGEST=false
 
 # On macOS, we can have several different docker providers, allow testing all
+# In cleanup, stop everything we know of but leave either Orbstack or Docker Desktop running
 if [ "${OSTYPE%%[0-9]*}" = "darwin" ]; then
   function cleanup {
-#      docker context use default
-    true
+    command -v orb 2>/dev/null && echo "Stopping orbstack" && (nohup orb stop &)
+    sleep 3 # Since we backgrounded orb stop, make sure it completes
+    if [ -f /Applications/Docker.app ]; then echo "Stopping Docker Desktop" && (killall com.docker.backend || true); fi
+    command -v colima 2>/dev/null && echo "Stopping colima" && (colima stop || true)
+    command -v colima 2>/dev/null && echo "Stopping colima_vz" && (colima stop vz || true)
+    command -v limactl 2>/dev/null && echo "Stopping lima" && (limactl stop lima-vz || true)
+    if [ -f ~/.rd/bin/rdctl ]; then echo "Stopping Rancher Desktop" && (~/.rd/bin/rdctl shutdown || true); fi
+    docker context use default
+    # Leave orbstack running as the most likely to be reliable, otherwise Docker Desktop
+    if command -v orb 2>/dev/null ; then
+      echo "Starting orbstack" && (nohup orb start &)
+    else
+      open -a Docker
+    fi
+    sleep 5
   }
   trap cleanup EXIT
 
-  echo "original docker context situation:"
+  # Start with a predictable docker provider running
+  cleanup
+
+  echo "starting docker context situation:"
   docker context ls
-  case ${DOCKER_TYPE} in
+
+  # Now start the docker provider we want
+  case ${DOCKER_TYPE:=none} in
+    "colima")
+      colima start
+      # Colima seems to end up working better with less failures if we restart after starting
+      colima restart
+      docker context use colima
+      ;;
+    "colima_vz")
+      colima start vz
+      colima restart vz
+      docker context use colima-vz
+      ;;
+
+    "lima")
+      limactl start lima-vz
+      docker context use lima-lima-vz
+      ;;
+
     "docker-desktop")
-      orb stop &
-      ~/.rd/bin/rdctl shutdown || true
-      open -a Docker &
+      open -a Docker
       docker context use desktop-linux
       ;;
+
     "orbstack")
-      ~/.rd/bin/rdctl shutdown || true
-      killall com.docker.backend || true
-      orb start &
+      nohup orb start &
+      sleep 3
       docker context use orbstack
       ;;
+
     "rancher-desktop")
-      killall com.docker.backend || true
-      orb stop &
       ~/.rd/bin/rdctl start
       for i in {1..120}; do
         if docker context use rancher-desktop >/dev/null 2>&1 ; then
@@ -55,56 +93,77 @@ if [ ${OSTYPE%%-*} = "linux" ]; then
 fi
 
 # Make sure docker is working
-echo "Waiting for docker to come up: $(date)"
-date && ${TIMEOUT_CMD} 10m bash -c 'while ! docker ps >/dev/null 2>&1 ; do
+echo "Waiting for docker provider to come up: $(date)"
+date && ${TIMEOUT_CMD} 3m bash -c 'while ! docker ps >/dev/null 2>&1 ; do
   sleep 10
-  echo "Waiting for docker to come up: $(date)"
+  echo "Waiting: $(date)"
 done'
 echo "Testing again to make sure docker came up: $(date)"
 if ! docker ps >/dev/null 2>&1 ; then
   echo "Docker is not running, exiting"
   exit 1
 fi
 
-echo "buildkite building ${BUILDKITE_JOB_ID:-} at $(date) on $(hostname) as USER=${USER} for OS=${OSTYPE} DOCKER_TYPE=${DOCKER_TYPE:notset} in ${PWD} with GOTEST_SHORT=${GOTEST_SHORT} golang=$(go version | awk '{print $3}') docker-desktop=$(scripts/docker-desktop-version.sh) docker=$(docker --version | awk '{print $3}') ddev version=$(ddev --version | awk '{print $3}'))"
-
+echo
+echo "buildkite building ${BUILDKITE_JOB_ID:-} at $(date) on $(hostname) as USER=${USER:-unknown} for OS=${OSTYPE:-unknown} DOCKER_TYPE=${DOCKER_TYPE:-notset} in ${PWD} with GOTEST_SHORT=${GOTEST_SHORT:-notset} golang=$(go version | awk '{print $3}') ddev version=$(ddev --version | awk '{print $3}')"
+
+echo
+case ${DOCKER_TYPE:-none} in
+  "docker-desktop")
+    echo "docker-desktop for mac version=$(scripts/docker-desktop-version.sh)"
+    ;;
+  "colima")
+    echo "colima version=$(colima version)"
+    ;;
+  "colima_vz")
+    echo "colima version=$(colima version)"
+    ;;
+
+  "orbstack")
+    echo "orbstack version=$(orbctl version)"
+    ;;
+  "rancher-desktop")
+    echo "rancher-desktop=$(~/.rd/bin/rdctl version)"
+    ;;
+  "wsl2dockerinside")
+    echo "Running wsl2dockerinside"
+    ;;
+  "dockerforwindows")
+    echo "Running Windows docker desktop for windows"
+    ;;
+  "wsl2-docker-desktop")
+    echo "Running wsl2-docker-desktop"
+    ;;
+  *)
+    echo "$DOCKER_TYPE not found"
+    ;;
+esac
+
+echo "Docker version:"
+docker version
+echo "ddev version"
 ddev version
+echo
 
 export DDEV_NONINTERACTIVE=true
 export DDEV_DEBUG=true
 
-set -o errexit
-set -o pipefail
-set -o nounset
-set -x
-
-# Broken docker context list from https://github.com/docker/for-win/issues/13180
-# When this is solved this can be removed.
-# The only place we care about non-default context is macOS Colima
-if ! docker context list >/dev/null; then
-  rm -rf ~/.docker/contexts && docker context list >/dev/null
+# We can skip builds with commit message of [skip buildkite]
+if [[ $BUILDKITE_MESSAGE == *"[skip buildkite]"* ]] || [[ $BUILDKITE_MESSAGE == *"[skip ci]"* ]]; then
+  echo "Skipping build because message has '[skip buildkite]' or '[skip ci]'"
+  exit 0
 fi
 
 # If this is a PR and the diff doesn't have code, skip it
 if [ "${BUILDKITE_PULL_REQUEST:-false}" != "false" ] && ! git diff --name-only refs/remotes/origin/${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-} | egrep "^(\.buildkite|Makefile|pkg|cmd|vendor|go\.)" >/dev/null; then
-  echo "Skipping build since no code changes found"
-  exit 0
-fi
-
-# We can skip builds with commit message of [skip buildkite]
-if [[ $BUILDKITE_MESSAGE == *"[skip buildkite]"* ]] || [[ $BUILDKITE_MESSAGE == *"[skip ci]"* ]]; then
-  echo "Skipping build because message has '[skip buildkite]' or '[skip ci]'"
+  echo "Skipping buildkite build since no code changes found"
   exit 0
 fi
 
-# On macOS, restart docker to avoid bugs where containers can't be deleted
-#if [ "${OSTYPE%%[0-9]*}" = "darwin" ]; then
-#  killall Docker || true
-#  nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended &
-#  sleep 10
-#fi
+set -x
 
-docker volume rm ddev-global-cache >/dev/null 2>&1 || true
+# We don't want any docker volumes to be existing and changing behavior
+docker volume prune -a -f >/dev/null 2>&1 || true
 
 # Run any testbot maintenance that may need to be done
 echo "--- running testbot_maintenance.sh"

.buildkite/testbot_maintenance.sh

@@ -4,7 +4,7 @@ set -eu -o pipefail
 
 os=$(go env GOOS)
 
-rm -rf ~/.ddev/Test* ~/.ddev/global_config.yaml ~/.ddev/homeadditions ~/.ddev/commands ~/.ddev/bin/docker-compose* ~/tmp/ddevtest
+rm -rf ~/.ddev/Test* ~/.ddev/global_config.yaml ~/.ddev/project_list.yaml ~/.ddev/homeadditions ~/.ddev/commands ~/.ddev/bin/docker-compose* ~/tmp/ddevtest
 
 # Latest git won't let you do much in a non-safe directory
 git config --global --add safe.directory '*' || true
@@ -27,7 +27,7 @@ fi
 # Upgrade various items on various operating systems
 case $os in
 darwin)
-    for item in ddev/ddev-edge/ddev golang golangci-lint libpq mkcert mkdocs; do
+    for item in ddev/ddev/ddev golang golangci-lint libpq mkcert mkdocs; do
         brew upgrade $item || brew install $item || true
     done
     brew link --force libpq
@@ -39,7 +39,7 @@ windows)
 linux)
     # homebrew is only on amd64
     if [ "$(arch)" = "x86_64" ]; then
-      for item in ddev/ddev-edge/ddev golang libpq mkcert mkdocs; do
+      for item in libpq mkcert mkdocs; do
         brew upgrade $item || brew install $item || true
       done
       brew link --force libpq
@@ -48,7 +48,8 @@ linux)
 
 esac
 
-(yes | ddev delete images >/dev/null) || true
+echo "Deleting unused images with ddev delete images"
+ddev delete images -y || true
 
 # Remove any -built images, as we want to make sure tests do the building.
 docker rmi -f $(docker images --filter "dangling=true" -q --no-trunc) >/dev/null 2>&1 || true