Skip to content

Commit 46c53dc

Browse files
bastianschwarzbastianschwarz
authored
Merge pull request #18 from codenamephp/dependabot/docker/docker/application/webdevops/php-dev-8.2
Bump webdevops/php-dev from 8.1 to 8.2 in /docker/application
2 parents 2a4a5a3 + a8b20ee commit 46c53dc

12 files changed

Lines changed: 544 additions & 393 deletions

File tree

‎.env.dist‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# UID and GID of your current user (e.g. wwwdev or developer). Can be looked up by using the linux command "id"
2+
# By default it is 1001 for vagrant vms (vagrant is 1000 and the next user is 1001)
3+
UID=1001
4+
GID=1001
5+
SSH_AUTH_SOCK=/run/user/1001/keyring/ssh

‎.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.0", "8.1"]'
22+
php-versions: '["8.0", "8.1", "8.2"]'

‎.idea/jsonSchemas.xml‎

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

‎.idea/php.xml‎

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

‎composer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"composer-unused": "XDEBUG_MODE=off tools/composer-unused --no-progress --no-interaction",
4444
"composer-require-checker": "XDEBUG_MODE=off tools/composer-require-checker --no-interaction",
4545
"infection": "XDEBUG_MODE=coverage tools/infection --min-msi=100 --min-covered-msi=100 --threads=4 --no-progress --show-mutations",
46+
"phive:update": "XDEBUG_MODE=off phive update && git add tools/* phive.xml && git commit tools/* -m 'Updated phive dependencies'",
4647
"ci-all": [
4748
"composer validate",
4849
"@phpunit",
@@ -58,6 +59,7 @@
5859
"composer-unused": "Checks for unused composer packages",
5960
"composer-require-checker": "Checks for missing required composer packages",
6061
"infection": "Creates mutation tests to discover missing test coverage",
62+
"phive:update": "Updates phive dependencies and commits them",
6163
"ci-all": "Runs all ci tools in sequence"
6264
}
6365
}

‎docker-compose.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ services:
1010
GID: ${GID:-1000}
1111
volumes:
1212
- ./:/app
13-
- ${WORKSPACE_FOLDER:-.}/.devcontainer/data/.phive:/home/application/.phive
14-
- ${WORKSPACE_FOLDER:-.}/.devcontainer/data/.ssh:/home/application/.ssh
13+
- $HOME/.phive:/home/application/.phive
14+
- $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: 2 additions & 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

@@ -20,6 +20,7 @@ RUN set -x \
2020

2121
WORKDIR /app
2222

23+
ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
2324
ARG UID
2425
ARG GID
2526

‎phive.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
~
1717
-->
1818
<phive xmlns="https://phar.io/phive">
19-
<phar name="phpunit" version="^9.0.1" installed="9.5.26" location="./tools/phpunit.phar" copy="true"/>
20-
<phar name="psalm" version="^5.0" installed="5.0.0" location="./tools/psalm" copy="true"/>
21-
<phar name="composer-unused" version="^0.8" installed="0.8.4" location="./tools/composer-unused" copy="true"/>
22-
<phar name="composer-require-checker" version="^4.0" installed="4.2.0" location="./tools/composer-require-checker" copy="true"/>
19+
<phar name="phpunit" version="^9.0.1" installed="9.5.27" location="./tools/phpunit.phar" copy="true"/>
20+
<phar name="psalm" version="^5.0" installed="5.1.0" location="./tools/psalm" copy="true"/>
21+
<phar name="composer-unused" version="^0.8" installed="0.8.5" location="./tools/composer-unused" copy="true"/>
22+
<phar name="composer-require-checker" version="^4.0" installed="4.3.0" location="./tools/composer-require-checker" copy="true"/>
2323
<phar name="infection" version="^0.26" installed="0.26.16" location="./tools/infection" copy="true"/>
2424
</phive>

‎tools/composer-require-checker‎

276 Bytes
Binary file not shown.

‎tools/composer-unused‎

206 KB
Binary file not shown.

0 commit comments

Comments
 (0)