diff --git a/.docksal/docksal.env b/.docksal/docksal.env index 3beab68..984c144 100644 --- a/.docksal/docksal.env +++ b/.docksal/docksal.env @@ -11,8 +11,8 @@ DOCKSAL_STACK=default # Lock images versions for LAMP services # This will prevent images from being updated when Docksal is updated #WEB_IMAGE='docksal/web:x.x-apache2.4' -DB_IMAGE='docksal/mysql:5.7' -CLI_IMAGE='docksal/cli:php8.1-3.3' +#DB_IMAGE='docksal/mysql:8.0' +#CLI_IMAGE='docksal/cli:php8.3-3.8' # Override virtual host (matches project folder name by default) # Override document root ('docroot' by default) diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 9a95fb6..bcb6d6f 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -6,6 +6,7 @@ env: DOCKSAL_SSH_AGENT_USE_HOST: 0 DOCKSAL_DNS_DISABLED: 1 DOCKSAL_DNS_DOMAIN: docksal.site + CLI_IMAGE: 'docksal/cli:php8:3-3:8' jobs: install: @@ -20,6 +21,6 @@ jobs: - name: fin sysinfo run: fin sysinfo - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install boilerplate run: fin init diff --git a/composer.json b/composer.json index 510b505..a13885c 100644 --- a/composer.json +++ b/composer.json @@ -10,16 +10,16 @@ } ], "require": { - "php": ">=8.1", + "php": ">=8.2", "acquia/acquia-cms-starterkit": "^1", "acquia/blt": "^13.7", "acquia/drupal-environment-detector": "^1", "acquia/memcache-settings": "^1", "composer/installers": "^2.1", - "cweagans/composer-patches": "^1.6", + "cweagans/composer-patches": "^1.7", "drupal/core-composer-scaffold": "^10", "drupal/core-recommended": "^10", - "drush/drush": "^11", + "drush/drush": "^12", "oomphinc/composer-installers-extender": "^2" }, "require-dev": { @@ -43,7 +43,7 @@ "acquia/blt": true }, "platform": { - "php": "8.1" + "php": "8.2" }, "sort-packages": true },