Skip to content

Commit 8f3c82c

Browse files
author
Sascha Nowak
authored
Merge pull request #634 from netlogix/feature/add-franken-php-8.5
2 parents 4202207 + 8c6f453 commit 8f3c82c

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

.github/workflows/frankenphp.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
- main
2121
paths:
2222
- php/**
23+
- .github/workflows/frankenphp.yml
2324
workflow_dispatch:
2425
inputs: {}
2526

@@ -41,6 +42,10 @@ jobs:
4142
file: frankenphp.Dockerfile
4243
build-args: |
4344
PHP_VERSION=8.4
45+
- version: 8.5
46+
file: frankenphp.Dockerfile
47+
build-args: |
48+
PHP_VERSION=8.5
4449
4550
steps:
4651
- name: Checkout

php/frankenphp.Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,21 @@ FROM app-frankenphp-base AS frankenphp-base-dev
137137
USER root
138138

139139
ENV PHP_XDEBUG_HOST=host.docker.internal \
140-
PHP_XDEBUG_MODE=off
140+
PHP_XDEBUG_MODE=off \
141+
PHP_ASSERT=1 \
142+
COMPOSER_CACHE_DIR=/.cache/composer/ \
143+
YARN_CACHE_FOLDER=/.cache/yarn/ \
144+
npm_config_cache=/.cache/npm/ \
145+
TIDEWAYS_DAEMON=""
146+
147+
# enable debugging with PhpStorm
148+
ENV PHP_IDE_CONFIG="serverName=localhost"
141149

142150
RUN <<EOF
143151
set -e
144152
apt-get update
145153
apt-get upgrade -y
154+
apt-get install -y git
146155
install-php-extensions xdebug
147156
rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
148157
EOF

0 commit comments

Comments
 (0)