Skip to content

Commit

Permalink
Merge pull request #55 from WengerK/feature/drush13-drupal11
Browse files Browse the repository at this point in the history
upgrade Drush from 12 -> 13 for Drupal 11
  • Loading branch information
WengerK authored Apr 25, 2024
2 parents 6da8da3 + b95ffd0 commit eb2c71a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions 11/11.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_IMAGE_TAG
FROM drupal:${BASE_IMAGE_TAG}-apache
FROM drupal:${BASE_IMAGE_TAG}-php8.3-apache

ARG DRUPAL_VER

Expand Down Expand Up @@ -29,10 +29,6 @@ RUN curl -OL https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait
# installed into the vendor directory.
RUN composer config --no-interaction allow-plugins true

# Install Drush.
# Drush will be heavily use to setup a working Drupal environment.
RUN COMPOSER_MEMORY_LIMIT=-1 composer require drush/drush:^12.0

# Prepare for Drupal 11.0 upgrade.
# @see https://www.drupal.org/docs/upgrading-drupal/upgrading-from-drupal-8-to-drupal-9-or-higher
RUN composer require drupal/core-recommended:~${DRUPAL_VER} --update-with-all-dependencies --no-update
Expand All @@ -41,9 +37,13 @@ RUN composer require drupal/core-dev:~${DRUPAL_VER} --dev --update-with-all-depe
# Set the minimum stability to "dev" to allow installing unstable Drupal Core.
RUN composer config minimum-stability dev

# Perform Drupal 10.1 installation.
# Perform Drupal 11.0-dev installation.
RUN COMPOSER_MEMORY_LIMIT=-1 composer update --with-all-dependencies

# Install Drush.
# Drush will be heavily use to setup a working Drupal environment.
RUN composer require drush/drush:^13.0 --with-all-dependencies

# Clean repository.
RUN apt-get clean && rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion 11/11.0/tests/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ commandTests:
- name: 'Drush version'
command: 'drush'
args: ['status']
expectedOutput: ['Drush version\s+:\s+12\.\d\.\d']
expectedOutput: ['Drush version\s+:\s+13\.x[\-alpha\d|\-beta\d|\-dev|\-rc\d|\d*]']
- name: 'PHPUnit location'
command: 'which'
args: ['phpunit']
Expand Down

0 comments on commit eb2c71a

Please sign in to comment.