From 38eec098b6658ad1ebeb4104c2293b2e0fb31dc8 Mon Sep 17 00:00:00 2001 From: Ofer Shaal Date: Thu, 5 Sep 2024 04:04:04 +0000 Subject: [PATCH] fix: updates --- .ddev/config.yaml | 17 ++++++++--------- .gitpod.yml | 2 +- .../drupal/drupalpod-setup/fallback_setup.sh | 2 +- .gitpod/images/Dockerfile | 18 ++++++------------ 4 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.ddev/config.yaml b/.ddev/config.yaml index b56b497..595e0b0 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -26,7 +26,7 @@ corepack_enable: false # docroot: # Relative path to the directory containing index.php. -# 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" +# 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" # You can explicitly specify the webimage but this # is not recommended, as the images are often closely tied to DDEV's' behavior, @@ -37,7 +37,8 @@ corepack_enable: false # database: # type: # mysql, mariadb, postgres # 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 +# MariaDB versions can be 5.5-10.8, 10.11, and 11.4. +# MySQL versions can be 5.5-8.0. # PostgreSQL versions can be 9-16. # router_http_port: # Port to be used for http (defaults to global configuration, usually 80) @@ -79,12 +80,10 @@ corepack_enable: false # 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 -# other named releases. -# see https://www.npmjs.com/package/n#specifying-nodejs-versions -# 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. +# See https://ddev.readthedocs.io/en/stable/users/configuration/config/#nodejs_version for more information +# and https://www.npmjs.com/package/n#specifying-nodejs-versions for the full documentation, +# Note that using of 'ddev nvm' is discouraged because "nodejs_version" is much easier to use, +# can specify any version, and is more robust than using 'nvm'. # corepack_enable: false # Change to 'true' to 'corepack enable' and gain access to latest versions of yarn/pnpm @@ -200,7 +199,7 @@ corepack_enable: false # disable_settings_management: false # If true, DDEV will not create CMS-specific settings files like -# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php +# Drupal's settings.php/settings.ddev.php or TYPO3's additional.php # In this case the user must provide all such settings. # You can inject environment variables into the web container with: diff --git a/.gitpod.yml b/.gitpod.yml index 9f40943..c654a54 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,4 +1,4 @@ -image: drupalpod/drupalpod-gitpod-base:20240419 +image: drupalpod/drupalpod-gitpod-base:20240905 # DDEV and composer are running as part of the prebuild # when starting a workspace all docker images are ready diff --git a/.gitpod/drupal/drupalpod-setup/fallback_setup.sh b/.gitpod/drupal/drupalpod-setup/fallback_setup.sh index 979f064..9fed6fa 100644 --- a/.gitpod/drupal/drupalpod-setup/fallback_setup.sh +++ b/.gitpod/drupal/drupalpod-setup/fallback_setup.sh @@ -5,6 +5,6 @@ set -eu -o pipefail export DP_INSTALL_PROFILE='demo_umami' export DP_PROJECT_TYPE='project_core' export DP_PROJECT_NAME="drupal" -export DP_CORE_VERSION='10.2.5' +export DP_CORE_VERSION='11.0.1' export DP_EXTRA_DEVEL=1 export DP_EXTRA_ADMIN_TOOLBAR=1 diff --git a/.gitpod/images/Dockerfile b/.gitpod/images/Dockerfile index d52a90e..ee671cb 100644 --- a/.gitpod/images/Dockerfile +++ b/.gitpod/images/Dockerfile @@ -9,32 +9,26 @@ 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 +RUN sudo apt-get update && sudo apt-get install -y ddev # Install GitUI (terminal-ui for git) -ARG GITUI_VERSION=v0.26.1 +ARG GITUI_VERSION=v0.26.3 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_Linux_x86_64.tar.gz -P /tmp -RUN tar -C /tmp -xf /tmp/lazygit_0.41.0_Linux_x86_64.tar.gz +ARG LAZYGIT_VERSION=0.43.1 +RUN wget https://github.com/jesseduffield/lazygit/releases/download/v${LAZYGIT_VERSION}/lazygit_${LAZYGIT_VERSION}_Linux_x86_64.tar.gz -P /tmp +RUN tar -C /tmp -xf /tmp/lazygit_${LAZYGIT_VERSION}_Linux_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 -ARG MINIO_CLIENT_VERSION=mcli_20240418164529.0.0_amd64.deb +ARG MINIO_CLIENT_VERSION=mcli_20240826104958.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