Skip to content

Commit 30145eb

Browse files
Updated phive tools and added php 8.2 to ci matrix
Signed-off-by: Bastian Schwarz <bastian@codename-php.de>
1 parent e021040 commit 30145eb

6 files changed

Lines changed: 43 additions & 4 deletions

File tree

.github/dependabot.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ updates:
1010
schedule:
1111
interval: "daily"
1212

13+
- package-ecosystem: "docker"
14+
directory: "/docker/application"
15+
schedule:
16+
interval: "daily"
17+
1318
- package-ecosystem: "github-actions"
1419
directory: "/"
1520
schedule:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
ci:
2020
uses: codenamephp/workflows.php/.github/workflows/ci.yml@main
2121
with:
22-
php-versions: '["8.1"]'
22+
php-versions: '["8.1", "8.2"]'

.idea/php.xml

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3.6'
22

33
services:
44
application:
5-
user: "${UID}:${GID}" #don't run as root by default to prevent permission conflicts
5+
user: "${UID:-1000}:${GID:-1000}" #don't run as root by default to prevent permission conflicts
66
build:
77
context: docker/application
88
args:
@@ -12,6 +12,7 @@ services:
1212
- ./:/app
1313
- $HOME/.phive:/home/application/.phive
1414
- $HOME/.ssh:/home/application/.ssh
15+
- $HOME/.gitconfig:/home/application/.gitconfig
1516
- ${SSH_AUTH_SOCK:-/ssh-agent}:/ssh-agent # Forward local machine SSH key to docker
1617
- /etc/timezone:/etc/timezone:ro
1718
- /etc/localtime:/etc/localtime:ro

docker/application/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM webdevops/php-dev:8.1
1+
FROM webdevops/php-dev:8.2
22

33
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
44

docker/application/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PHP_DEBUGGER=xdebug
22

3-
XDEBUG_MODE=develop
3+
php.xdebug.mode=develop

0 commit comments

Comments
 (0)