Skip to content

Commit ada1cad

Browse files
author
Ofer Shaal
committed
Upgrade to latest Drupal and latest ddev
1 parent 36b7f27 commit ada1cad

6 files changed

Lines changed: 18 additions & 14 deletions

File tree

.ddev/config.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ corepack_enable: false
1919
# name: <projectname> # Name of the project, automatically provides
2020
# http://projectname.ddev.site and https://projectname.ddev.site
2121

22-
# type: <projecttype> # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
22+
# type: <projecttype> # backdrop, cakephp, craftcms, drupal, drupal6, drupal7, drupal8, drupal9, drupal10, drupal11, generic, laravel, magento, magento2, php, shopware6, silverstripe, symfony, typo3, wordpress
2323
# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
2424
# information on the different project types
25-
# "drupal" covers recent Drupal 8+
2625

2726
# docroot: <relative_path> # Relative path to the directory containing index.php.
2827

29-
# php_version: "8.2" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"
28+
# php_version: "8.3" # PHP version to use, "5.6" through "8.4"
3029

3130
# You can explicitly specify the webimage but this
3231
# is not recommended, as the images are often closely tied to DDEV's' behavior,
@@ -39,7 +38,7 @@ corepack_enable: false
3938
# version: <version> # database version, like "10.11" or "8.0"
4039
# MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
4140
# MySQL versions can be 5.5-8.0.
42-
# PostgreSQL versions can be 9-16.
41+
# PostgreSQL versions can be 9-17.
4342

4443
# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
4544
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)
@@ -54,9 +53,11 @@ corepack_enable: false
5453
# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
5554
# as leaving Xhprof enabled all the time is a big performance hit.
5655

57-
# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn
56+
# webserver_type: nginx-fpm, apache-fpm, generic
5857

5958
# timezone: Europe/Berlin
59+
# If timezone is unset, DDEV will attempt to derive it from the host system timezone
60+
# using the $TZ environment variable or the /etc/localtime symlink.
6061
# This is the timezone used in the containers and by PHP;
6162
# it can be set to any valid timezone,
6263
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
@@ -76,9 +77,9 @@ corepack_enable: false
7677
# - preview
7778
# - snapshot
7879
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
79-
# To reinstall Composer after the image was built, run "ddev debug refresh".
80+
# To reinstall Composer after the image was built, run "ddev debug rebuild".
8081

81-
# nodejs_version: "20"
82+
# nodejs_version: "22"
8283
# change from the default system Node.js version to any other version.
8384
# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
8485
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
@@ -204,8 +205,8 @@ corepack_enable: false
204205

205206
# You can inject environment variables into the web container with:
206207
# web_environment:
207-
# - SOMEENV=somevalue
208-
# - SOMEOTHERENV=someothervalue
208+
# - SOMEENV=somevalue
209+
# - SOMEOTHERENV=someothervalue
209210

210211
# no_project_mount: false
211212
# (Experimental) If true, DDEV will not mount the project into the web container;

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: drupalpod/drupalpod-gitpod-base:20240905
1+
image: drupalpod/drupalpod-gitpod-base:20250309
22

33
# DDEV and composer are running as part of the prebuild
44
# when starting a workspace all docker images are ready

.gitpod/drupal/drupalpod-setup/composer_setup.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ ddev composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient
3131

3232
ddev composer config --no-plugins allow-plugins.php-http/discovery true
3333

34+
ddev composer config --no-plugins allow-plugins.tbachert/spi true
35+
3436
# Add project source code as symlink (to repos/name_of_project)
3537
# double quotes explained - https://stackoverflow.com/a/1250279/5754049
3638
if [ -n "$DP_PROJECT_NAME" ]; then

.gitpod/drupal/drupalpod-setup/fallback_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ set -eu -o pipefail
55
export DP_INSTALL_PROFILE='demo_umami'
66
export DP_PROJECT_TYPE='project_core'
77
export DP_PROJECT_NAME="drupal"
8-
export DP_CORE_VERSION='11.0.1'
8+
export DP_CORE_VERSION='11.1.4'
99
export DP_EXTRA_DEVEL=1
1010
export DP_EXTRA_ADMIN_TOOLBAR=1

.gitpod/images/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/ddev.gpg] https://pkg.ddev.com/apt/ *
1616
RUN sudo apt-get update && sudo apt-get install -y ddev
1717

1818
# Install GitUI (terminal-ui for git)
19-
ARG GITUI_VERSION=v0.26.3
19+
ARG GITUI_VERSION=v0.27.0
2020
RUN wget https://github.com/extrawurst/gitui/releases/download/${GITUI_VERSION}/gitui-linux-x86_64.tar.gz -P /tmp
2121
RUN sudo tar xzf /tmp/gitui-linux-x86_64.tar.gz -C /usr/bin
2222

2323
# Install LazyGit (terminal-ui for git)
24-
ARG LAZYGIT_VERSION=0.43.1
24+
ARG LAZYGIT_VERSION=0.48.0
2525
RUN wget https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz -P /tmp
2626
RUN tar -C /tmp -xf /tmp/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz
2727
RUN sudo install /tmp/lazygit /usr/local/bin
2828

2929
# (get latest Minio version from https://dl.min.io/client/mc/release/linux-amd64/)
3030
# Install Minio client
31-
ARG MINIO_CLIENT_VERSION=mcli_20240826104958.0.0_amd64.deb
31+
ARG MINIO_CLIENT_VERSION=mcli_20250221160046.0.0_amd64.deb
3232
RUN wget https://dl.min.io/client/mc/release/linux-amd64/${MINIO_CLIENT_VERSION}
3333
RUN sudo dpkg -i ${MINIO_CLIENT_VERSION}
3434
RUN sudo mv /usr/local/bin/mcli /usr/local/bin/mc

recipes/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/README.txt

0 commit comments

Comments
 (0)