fix: update ddev-gitpod image (latest ddev version)

.ddev/config.yaml

@@ -1,5 +1,5 @@
 name: DrupalPod
-type: drupal10
+type: drupal
 docroot: web
 php_version: "8.3"
 webserver_type: nginx-fpm
@@ -12,19 +12,21 @@ database:
 use_dns_when_possible: true
 composer_version: "2"
 web_environment: []
+corepack_enable: false
 
 # Key features of DDEV's config.yaml:
 
 # name: <projectname> # Name of the project, automatically provides
 #   http://projectname.ddev.site and https://projectname.ddev.site
 
-# type: <projecttype>  # backdrop, craftcms, django4, drupal6/7/8/9/10, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
-# See https://ddev.readthedocs.io/en/latest/users/quickstart/ for more
+# type: <projecttype>  # backdrop, craftcms, django4, drupal, drupal6, drupal7, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
+# See https://ddev.readthedocs.io/en/stable/users/quickstart/ for more
 # information on the different project types
+# "drupal" covers recent Drupal 8+
 
 # docroot: <relative_path> # Relative path to the directory containing index.php.
 
-# php_version: "8.1"  # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"
+# 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"
 
 # You can explicitly specify the webimage but this
 # is not recommended, as the images are often closely tied to DDEV's' behavior,
@@ -34,7 +36,7 @@ web_environment: []
 
 # database:
 #   type: <dbtype> # mysql, mariadb, postgres
-#   version: <version> # database version, like "10.4" or "8.0"
+#   version: <version> # database version, like "10.11" or "8.0"
 #   MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
 #   PostgreSQL versions can be 9-16.
 
@@ -75,7 +77,7 @@ web_environment: []
 # Alternatively, an explicit Composer version may be specified, for example "2.2.18".
 # To reinstall Composer after the image was built, run "ddev debug refresh".
 
-# nodejs_version: "18"
+# nodejs_version: "20"
 # change from the default system Node.js version to any other version.
 # Numeric version numbers can be complete (i.e. 18.15.0) or
 # incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
@@ -84,6 +86,9 @@ web_environment: []
 # Note that you can continue using 'ddev nvm' or nvm inside the web container
 # to change the project's installed node version if you need to.
 
+# corepack_enable: false
+# Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm
+
 # additional_hostnames:
 #  - somename
 #  - someothername
@@ -141,8 +146,8 @@ web_environment: []
 #   - "mutagen": enables Mutagen for this project.
 #   - "nfs":     enables NFS for this project.
 #
-# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
-# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#nfs
+# See https://ddev.readthedocs.io/en/stable/users/install/performance/#mutagen
 
 # fail_on_hook_fail: False
 # Decide whether 'ddev start' should be interrupted by a failing hook
@@ -274,5 +279,6 @@ web_environment: []
 # for them. Example:
 #hooks:
 # post-import-db:
-#   - exec: drush cr
-#   - exec: drush updb
+#   - exec: drush sql:sanitize
+#   - exec: drush updatedb
+#   - exec: drush cache:rebuild

.gitpod.yml

@@ -1,4 +1,4 @@
-image: drupalpod/drupalpod-gitpod-base:20231222
+image: drupalpod/drupalpod-gitpod-base:20240419
 
 # DDEV and composer are running as part of the prebuild
 # when starting a workspace all docker images are ready

.gitpod/README.md

@@ -4,8 +4,10 @@
 
 1. Update `.gitpod/images/Dockerfile`:
 
+    1. Update `ddev` latest version.
     1. Update `minio` latest version.
     1. Update `gitui` latest version.
+    1. Update `lazygit` latest version.
 
 1. Generate new custom docker image:
 

.gitpod/images/Dockerfile

@@ -8,20 +8,35 @@ RUN sudo apt-get -qq install -y dialog
 
 # Install DDEV
 USER gitpod
+# Add DDEV’s GPG key to your keyring
+RUN sudo sh -c 'echo ""'
 RUN sudo install -m 0755 -d /etc/apt/keyrings
 RUN curl -fsSL https://pkg.ddev.com/apt/gpg.key | gpg --dearmor | sudo tee /etc/apt/keyrings/ddev.gpg > /dev/null
 RUN sudo chmod a+r /etc/apt/keyrings/ddev.gpg
+
+# Add DDEV releases to your package repository
+RUN sudo sh -c 'echo ""'
 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
+
+# Update package information and install DDEV
+RUN sudo sh -c 'echo ""'
 RUN sudo apt update && sudo apt install -y ddev
 
 # Install GitUI (terminal-ui for git)
-RUN wget https://github.com/extrawurst/gitui/releases/download/v0.24.3/gitui-linux-musl.tar.gz -P /tmp
-RUN sudo tar xzf /tmp/gitui-linux-musl.tar.gz -C /usr/bin
+ARG GITUI_VERSION=v0.26.1
+RUN wget https://github.com/extrawurst/gitui/releases/download/${GITUI_VERSION}/gitui-linux-x86_64.tar.gz -P /tmp
+RUN sudo tar xzf /tmp/gitui-linux-x86_64.tar.gz -C /usr/bin
+
+# Install LazyGit (terminal-ui for git)
+RUN wget https://github.com/jesseduffield/lazygit/releases/download/v0.41.0/lazygit_0.41.0_Darwin_x86_64.tar.gz -P /tmp
+RUN tar -C /tmp -xf /tmp/lazygit_0.41.0_Darwin_x86_64.tar.gz
+RUN sudo install /tmp/lazygit /usr/local/bin
 
 # (get latest Minio version from https://dl.min.io/client/mc/release/linux-amd64/)
 # Install Minio client
-RUN wget https://dl.min.io/client/mc/release/linux-amd64/mcli_20231220071422.0.0_amd64.deb
-RUN sudo dpkg -i mcli_20231220071422.0.0_amd64.deb
+ARG MINIO_CLIENT_VERSION=mcli_20240418164529.0.0_amd64.deb
+RUN wget https://dl.min.io/client/mc/release/linux-amd64/${MINIO_CLIENT_VERSION}
+RUN sudo dpkg -i ${MINIO_CLIENT_VERSION}
 RUN sudo mv /usr/local/bin/mcli /usr/local/bin/mc
 
 # End workspace-base