From 0c346b0ed0ca1b41ef87bf7e9ce0a848ed07662b Mon Sep 17 00:00:00 2001 From: Alex Tkachev Date: Sun, 5 Nov 2023 08:32:51 +0400 Subject: [PATCH] chore: php 8.2 --- .github/actions/setup/action.yml | 2 +- .gitpod.Dockerfile | 6 +++--- .lagoon/Dockerfile | 4 ++-- apps/cms/composer.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index fb11d6f93..bd2280348 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -11,7 +11,7 @@ runs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php-version: '8.2' - uses: pnpm/action-setup@v2 name: Install pnpm diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index d24e5531e..927b09033 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,11 +1,11 @@ FROM gitpod/workspace-full -RUN sudo update-alternatives --set php $(which php8.1) -RUN sudo install-packages php8.1-gd php8.1-mbstring php8.1-curl php8.1-sqlite3 php8.1-zip php8.1-xdebug php8.1-imagick +RUN sudo update-alternatives --set php $(which php8.2) +RUN sudo install-packages php8.2-gd php8.2-mbstring php8.2-curl php8.2-sqlite3 php8.2-zip php8.2-xdebug php8.2-imagick RUN pnpx playwright@1.32.3 install-deps RUN pnpx playwright@1.32.3 install RUN npm install -g pnpm@8.6.12 @withgraphite/graphite-cli -COPY .gitpod/xdebug.ini /etc/php/8.1/mods-available/xdebug.ini +COPY .gitpod/xdebug.ini /etc/php/8.2/mods-available/xdebug.ini RUN curl -fsSL https://deno.land/x/install/install.sh | sh RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-deno && \ echo 'export DENO_INSTALL="/home/gitpod/.deno"' >> /home/gitpod/.bashrc.d/90-deno && \ diff --git a/.lagoon/Dockerfile b/.lagoon/Dockerfile index 388ad542a..82ef7fa8e 100644 --- a/.lagoon/Dockerfile +++ b/.lagoon/Dockerfile @@ -31,7 +31,7 @@ RUN --mount=type=cache,target=/tmp/cache pnpm deploy --filter "@custom/website" # ==================================================================================================== # CLI IMAGE # ==================================================================================================== -FROM uselagoon/php-8.1-cli-drupal as cli +FROM uselagoon/php-8.2-cli-drupal as cli RUN apk add --no-cache git qpdf imagemagick icu-dev && \ docker-php-ext-install intl && \ @@ -53,7 +53,7 @@ ENV WEBROOT=web # ==================================================================================================== # PHP IMAGE # ==================================================================================================== -FROM uselagoon/php-8.1-fpm as php +FROM uselagoon/php-8.2-fpm as php RUN apk add --no-cache imagemagick qpdf icu-dev && \ docker-php-ext-install intl && \ docker-php-ext-enable intl diff --git a/apps/cms/composer.json b/apps/cms/composer.json index 810c814f7..930c75ea0 100644 --- a/apps/cms/composer.json +++ b/apps/cms/composer.json @@ -27,7 +27,7 @@ } ], "require": { - "php": "^8.1 <8.2", + "php": "^8.2 <8.3", "amazeeio/drupal_integrations": "^0.3.7", "amazeelabs/default-content": "^1.2.11", "amazeelabs/graphql_directives": "^2.1",