Skip to content

Commit

Permalink
PHP 8.3 (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
mstrelan authored Jan 29, 2024
1 parent 85bb69e commit 1b9bcae
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ endif
DRUSH=$(EXEC) ./bin/drush
DRUSH_INSTALL=$(DRUSH) -y site:install --account-pass=password
GIT_SWITCH=cd app && git switch
PHP_VERSION=8.2
PHP_VERSION=8.3

clean: composer minimal login

composer:
rm -rf composer.lock vendor app/vendor
$(EXEC) composer install
$(EXEC) composer install --ignore-platform-req=php

start: stop-php
PHP_VERSION=$(PHP_VERSION) $(DOCKER_COMPOSE) up --build -d
Expand Down Expand Up @@ -69,7 +69,7 @@ switch:
$(GIT_SWITCH) 10.2.x
make clean

11.x: php8.2
11.x: php8.3
$(GIT_SWITCH) 11.x
make clean

Expand All @@ -84,3 +84,6 @@ php8.1:

php8.2:
make start -e PHP_VERSION=8.2

php8.3:
make start -e PHP_VERSION=8.3
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Make commands should be executed on the host machine.
* `login` - gets a one-time login link
* `switch` - switches branch, e.g. `make BRANCH=9.3 switch`
* `9.3|9.4|9.5|10.0|10.1|11.x` - provides a clean environment with the specified Drupal version
* `php7.4|php8.0|php8.1|php8.2` - starts with stack with the specified php version
* `php7.4|php8.0|php8.1|php8.2|php8.3` - starts with stack with the specified php version

## PhpStorm configuration

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
php-fpm:
build:
args:
BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.2}-dev-v2-latest
BASE_IMAGE: skpr/php-fpm:${PHP_VERSION:-8.3}-dev-v2-latest
USERNAME: ${USERNAME:-skpr}
UID: ${UID:-1000}
GID: ${GID:-1000}
Expand All @@ -29,7 +29,7 @@ services:
php-cli:
build:
args:
BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.2}-dev-v2-latest
BASE_IMAGE: skpr/php-cli:${PHP_VERSION:-8.3}-dev-v2-latest
USERNAME: ${USERNAME:-skpr}
UID: ${UID:-1000}
GID: ${GID:-1000}
Expand Down

0 comments on commit 1b9bcae

Please sign in to comment.