Skip to content

Commit 38eec09

Browse files
committed
fix: updates
1 parent 3f06737 commit 38eec09

4 files changed

Lines changed: 16 additions & 23 deletions

File tree

.ddev/config.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ corepack_enable: false
2626

2727
# docroot: <relative_path> # Relative path to the directory containing index.php.
2828

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"
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"
3030

3131
# You can explicitly specify the webimage but this
3232
# is not recommended, as the images are often closely tied to DDEV's' behavior,
@@ -37,7 +37,8 @@ corepack_enable: false
3737
# database:
3838
# type: <dbtype> # mysql, mariadb, postgres
3939
# version: <version> # database version, like "10.11" or "8.0"
40-
# MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
40+
# MariaDB versions can be 5.5-10.8, 10.11, and 11.4.
41+
# MySQL versions can be 5.5-8.0.
4142
# PostgreSQL versions can be 9-16.
4243

4344
# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
@@ -79,12 +80,10 @@ corepack_enable: false
7980

8081
# nodejs_version: "20"
8182
# change from the default system Node.js version to any other version.
82-
# Numeric version numbers can be complete (i.e. 18.15.0) or
83-
# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
84-
# other named releases.
85-
# see https://www.npmjs.com/package/n#specifying-nodejs-versions
86-
# Note that you can continue using 'ddev nvm' or nvm inside the web container
87-
# to change the project's installed node version if you need to.
83+
# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information
84+
# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation,
85+
# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use,
86+
# can specify any version, and is more robust than using 'nvm'.
8887

8988
# corepack_enable: false
9089
# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
@@ -200,7 +199,7 @@ corepack_enable: false
200199

201200
# disable_settings_management: false
202201
# If true, DDEV will not create CMS-specific settings files like
203-
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
202+
# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php
204203
# In this case the user must provide all such settings.
205204

206205
# You can inject environment variables into the web container with:

.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:20240419
1+
image: drupalpod/drupalpod-gitpod-base:20240905
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/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='10.2.5'
8+
export DP_CORE_VERSION='11.0.1'
99
export DP_EXTRA_DEVEL=1
1010
export DP_EXTRA_ADMIN_TOOLBAR=1

.gitpod/images/Dockerfile

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,26 @@ RUN sudo apt-get -qq install -y dialog
99
# Install DDEV
1010
USER gitpod
1111
# Add DDEV’s GPG key to your keyring
12-
RUN sudo sh -c 'echo ""'
13-
RUN sudo install -m 0755 -d /etc/apt/keyrings
1412
RUN curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/keyrings/ddev.gpg > /dev/null
15-
RUN sudo chmod a+r /etc/apt/keyrings/ddev.gpg
16-
1713
# Add DDEV releases to your package repository
18-
RUN sudo sh -c 'echo ""'
1914
RUN echo "deb [signed-by=/etc/apt/keyrings/ddev.gpg] https://pkg.ddev.com/apt/ * *" | sudo tee /etc/apt/sources.list.d/ddev.list >/dev/null
20-
2115
# Update package information and install DDEV
22-
RUN sudo sh -c 'echo ""'
23-
RUN sudo apt update && sudo apt install -y ddev
16+
RUN sudo apt-get update && sudo apt-get install -y ddev
2417

2518
# Install GitUI (terminal-ui for git)
26-
ARG GITUI_VERSION=v0.26.1
19+
ARG GITUI_VERSION=v0.26.3
2720
RUN wget https://github.com/extrawurst/gitui/releases/download/${GITUI_VERSION}/gitui-linux-x86_64.tar.gz -P /tmp
2821
RUN sudo tar xzf /tmp/gitui-linux-x86_64.tar.gz -C /usr/bin
2922

3023
# Install LazyGit (terminal-ui for git)
31-
RUN wget https://github.com/jesseduffield/lazygit/releases/download/v0.41.0/lazygit_0.41.0_Linux_x86_64.tar.gz -P /tmp
32-
RUN tar -C /tmp -xf /tmp/lazygit_0.41.0_Linux_x86_64.tar.gz
24+
ARG LAZYGIT_VERSION=0.43.1
25+
RUN wget https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz -P /tmp
26+
RUN tar -C /tmp -xf /tmp/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz
3327
RUN sudo install /tmp/lazygit /usr/local/bin
3428

3529
# (get latest Minio version from https://dl.min.io/client/mc/release/linux-amd64/)
3630
# Install Minio client
37-
ARG MINIO_CLIENT_VERSION=mcli_20240418164529.0.0_amd64.deb
31+
ARG MINIO_CLIENT_VERSION=mcli_20240826104958.0.0_amd64.deb
3832
RUN wget https://dl.min.io/client/mc/release/linux-amd64/${MINIO_CLIENT_VERSION}
3933
RUN sudo dpkg -i ${MINIO_CLIENT_VERSION}
4034
RUN sudo mv /usr/local/bin/mcli /usr/local/bin/mc

0 commit comments

Comments
 (0)