Skip to content

Commit 380a028

Browse files
Merge remote-tracking branch 'origin/8.3' into 8.4
2 parents ecf2157 + c17441d commit 380a028

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
environment:
6666
COMPOSER_CACHE_DIR: /home/circleci/composer/cache-dir
6767
docker:
68-
- image: cimg/php:8.0-node
68+
- image: cimg/php:8.2-node
6969
steps:
7070
- attach_workspace: *attach_workspace
7171
- run: chmod -R 777 /home/circleci
@@ -82,7 +82,7 @@ jobs:
8282
environment:
8383
FLOW_CONTEXT: Production
8484
docker:
85-
- image: cimg/php:8.0-node
85+
- image: cimg/php:8.2-node
8686
- image: cimg/mariadb:10.6
8787
environment:
8888
MYSQL_DATABASE: neos
@@ -121,7 +121,7 @@ jobs:
121121
environment:
122122
FLOW_CONTEXT: Production
123123
docker:
124-
- image: cimg/php:8.0-node
124+
- image: cimg/php:8.2-node
125125
- image: cimg/mariadb:10.6
126126
environment:
127127
MYSQL_DATABASE: neos

Tests/IntegrationTests/docker-compose.neos-dev-instance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.4"
22
services:
33

44
php:
5-
image: thecodingmachine/php:8.0-v4-cli-node16
5+
image: thecodingmachine/php:8.2-v4-cli-node16
66
command: tail -f /dev/null
77
ports:
88
- 8081:8081

Tests/IntegrationTests/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.4"
22
services:
33

44
php:
5-
image: thecodingmachine/php:8.0-v4-cli-node16
5+
image: thecodingmachine/php:8.2-v4-cli-node16
66
command: tail -f /dev/null
77
ports:
88
- 8081:8081

0 commit comments

Comments
 (0)