Skip to content

Commit 150f431

Browse files
JeroenBoersmaJeroenBoersma
committed
Soft disabling old php versions and adding php 8.4
- php56 - php70 - php71 - php72 - php73
1 parent c45e765 commit 150f431

File tree

5 files changed

+163
-126
lines changed

5 files changed

+163
-126
lines changed

‎build/dist/docker-compose-blackfire.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ services:
44
- ./conf/blackfire
55
build: build/dist/blackfire
66

7-
php72:
8-
environment:
9-
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
10-
php73:
11-
environment:
12-
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
7+
# php72:
8+
# environment:
9+
# - "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
10+
# php73:
11+
# environment:
12+
# - "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
1313
php74:
1414
environment:
1515
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
@@ -22,4 +22,10 @@ services:
2222
php82:
2323
environment:
2424
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
25+
php83:
26+
environment:
27+
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
28+
php84:
29+
environment:
30+
- "BLACKFIRE_AGENT_SOCKET=tcp://blackfire:8307"
2531

‎build/dist/docker-compose-ssh.yml

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,55 @@
11
services:
2-
php70:
3-
environment:
4-
SSH_AUTH_SOCK: "/ssh-socket"
5-
volumes:
6-
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
7-
php56:
8-
environment:
9-
SSH_AUTH_SOCK: "/ssh-socket"
10-
volumes:
11-
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
12-
php71:
13-
environment:
14-
SSH_AUTH_SOCK: "/ssh-socket"
15-
volumes:
16-
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
17-
php72:
2+
# php70:
3+
# environment:
4+
# SSH_AUTH_SOCK: "/ssh-socket"
5+
# volumes:
6+
# - ${SSH_AUTH_SOCK}:/ssh-socket:ro
7+
# php56:
8+
# environment:
9+
# SSH_AUTH_SOCK: "/ssh-socket"
10+
# volumes:
11+
# - ${SSH_AUTH_SOCK}:/ssh-socket:ro
12+
# php71:
13+
# environment:
14+
# SSH_AUTH_SOCK: "/ssh-socket"
15+
# volumes:
16+
# - ${SSH_AUTH_SOCK}:/ssh-socket:ro
17+
# php72:
18+
# environment:
19+
# SSH_AUTH_SOCK: "/ssh-socket"
20+
# volumes:
21+
# - ${SSH_AUTH_SOCK}:/ssh-socket:ro
22+
# php73:
23+
# environment:
24+
# SSH_AUTH_SOCK: "/ssh-socket"
25+
# volumes:
26+
# - ${SSH_AUTH_SOCK}:/ssh-socket:ro
27+
php74:
1828
environment:
1929
SSH_AUTH_SOCK: "/ssh-socket"
2030
volumes:
2131
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
22-
php73:
32+
php80:
2333
environment:
2434
SSH_AUTH_SOCK: "/ssh-socket"
2535
volumes:
2636
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
27-
php74:
37+
php81:
2838
environment:
2939
SSH_AUTH_SOCK: "/ssh-socket"
3040
volumes:
3141
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
32-
php80:
42+
php82:
3343
environment:
3444
SSH_AUTH_SOCK: "/ssh-socket"
3545
volumes:
3646
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
37-
php81:
47+
php83:
3848
environment:
3949
SSH_AUTH_SOCK: "/ssh-socket"
4050
volumes:
4151
- ${SSH_AUTH_SOCK}:/ssh-socket:ro
42-
php82:
52+
php84:
4353
environment:
4454
SSH_AUTH_SOCK: "/ssh-socket"
4555
volumes:

‎build/dist/web/nginx/backends.conf

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
upstream fastcgi_backend {
22
server php74:9000;
33
}
4-
upstream fastcgi56_backend {
5-
server php56:9000;
6-
}
7-
upstream fastcgi70_backend {
8-
server php70:9000;
9-
}
10-
upstream fastcgi71_backend {
11-
server php71:9000;
12-
}
13-
upstream fastcgi72_backend {
14-
server php72:9000;
15-
}
16-
upstream fastcgi73_backend {
17-
server php73:9000;
18-
}
4+
#upstream fastcgi56_backend {
5+
# server php56:9000;
6+
#}
7+
#upstream fastcgi70_backend {
8+
# server php70:9000;
9+
#}
10+
#upstream fastcgi71_backend {
11+
# server php71:9000;
12+
#}
13+
#upstream fastcgi72_backend {
14+
# server php72:9000;
15+
#}
16+
#upstream fastcgi73_backend {
17+
# server php73:9000;
18+
#}
1919
upstream fastcgi74_backend {
2020
server php74:9000;
2121
}
@@ -31,4 +31,7 @@ upstream fastcgi82_backend {
3131
upstream fastcgi83_backend {
3232
server php83:9000;
3333
}
34+
upstream fastcgi84_backend {
35+
server php84:9000;
36+
}
3437

‎build/dist/web/nginx/content/php

Lines changed: 54 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
set $php '';
22

3-
if ( -f $dev_base_root/.php56 ) {
4-
set $php '56';
5-
}
6-
if ( -f $dev_base_root/.php70 ) {
7-
set $php '70';
8-
}
9-
if ( -f $dev_base_root/.php71 ) {
10-
set $php '71';
11-
}
12-
if ( -f $dev_base_root/.php72 ) {
13-
set $php '72';
14-
}
15-
if ( -f $dev_base_root/.php73 ) {
16-
set $php '73';
17-
}
3+
#if ( -f $dev_base_root/.php56 ) {
4+
# set $php '56';
5+
#}
6+
#if ( -f $dev_base_root/.php70 ) {
7+
# set $php '70';
8+
#}
9+
#if ( -f $dev_base_root/.php71 ) {
10+
# set $php '71';
11+
#}
12+
#if ( -f $dev_base_root/.php72 ) {
13+
# set $php '72';
14+
#}
15+
#if ( -f $dev_base_root/.php73 ) {
16+
# set $php '73';
17+
#}
1818
if ( -f $dev_base_root/.php74 ) {
1919
set $php '74';
2020
}
@@ -30,22 +30,25 @@ if ( -f $dev_base_root/.php82 ) {
3030
if ( -f $dev_base_root/.php83 ) {
3131
set $php '83';
3232
}
33-
34-
if ( -f $dev_customer_root/.php56 ) {
35-
set $php '56';
36-
}
37-
if ( -f $dev_customer_root/.php70 ) {
38-
set $php '70';
39-
}
40-
if ( -f $dev_customer_root/.php71 ) {
41-
set $php '71';
42-
}
43-
if ( -f $dev_customer_root/.php72 ) {
44-
set $php '72';
45-
}
46-
if ( -f $dev_customer_root/.php73 ) {
47-
set $php '73';
33+
if ( -f $dev_base_root/.php84 ) {
34+
set $php '84';
4835
}
36+
37+
#if ( -f $dev_customer_root/.php56 ) {
38+
# set $php '56';
39+
#}
40+
#if ( -f $dev_customer_root/.php70 ) {
41+
# set $php '70';
42+
#}
43+
#if ( -f $dev_customer_root/.php71 ) {
44+
# set $php '71';
45+
#}
46+
#if ( -f $dev_customer_root/.php72 ) {
47+
# set $php '72';
48+
#}
49+
#if ( -f $dev_customer_root/.php73 ) {
50+
# set $php '73';
51+
#}
4952
if ( -f $dev_customer_root/.php74 ) {
5053
set $php '74';
5154
}
@@ -61,22 +64,25 @@ if ( -f $dev_customer_root/.php82 ) {
6164
if ( -f $dev_customer_root/.php83 ) {
6265
set $php '83';
6366
}
64-
65-
if ( -f $dev_root/.php56 ) {
66-
set $php '56';
67-
}
68-
if ( -f $dev_root/.php70 ) {
69-
set $php '70';
70-
}
71-
if ( -f $dev_root/.php71 ) {
72-
set $php '71';
73-
}
74-
if ( -f $dev_root/.php72 ) {
75-
set $php '72';
76-
}
77-
if ( -f $dev_root/.php73 ) {
78-
set $php '73';
67+
if ( -f $dev_customer_root/.php84 ) {
68+
set $php '84';
7969
}
70+
71+
#if ( -f $dev_root/.php56 ) {
72+
# set $php '56';
73+
#}
74+
#if ( -f $dev_root/.php70 ) {
75+
# set $php '70';
76+
#}
77+
#if ( -f $dev_root/.php71 ) {
78+
# set $php '71';
79+
#}
80+
#if ( -f $dev_root/.php72 ) {
81+
# set $php '72';
82+
#}
83+
#if ( -f $dev_root/.php73 ) {
84+
# set $php '73';
85+
#}
8086
if ( -f $dev_root/.php74 ) {
8187
set $php '74';
8288
}
@@ -92,4 +98,7 @@ if ( -f $dev_root/.php82 ) {
9298
if ( -f $dev_root/.php83 ) {
9399
set $php '83';
94100
}
101+
if ( -f $dev_root/.php84 ) {
102+
set $php '84';
103+
}
95104

‎docker-compose.yml

Lines changed: 48 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,45 +19,45 @@ services:
1919
mailcatch:
2020
image: mailhog/mailhog
2121

22-
php56:
23-
build:
24-
context: build/dist/php
25-
args:
26-
- FROM_TAG=php5-fpm
27-
volumes:
28-
- dockerdev-workspace-volume:/data
29-
php70:
30-
build:
31-
context: build/dist/php
32-
args:
33-
- FROM_TAG=php7-fpm
34-
volumes:
35-
- dockerdev-workspace-volume:/data
36-
php71:
37-
build:
38-
context: build/dist/php
39-
args:
40-
- FROM_TAG=php71-fpm
41-
volumes:
42-
- dockerdev-workspace-volume:/data
43-
php72:
44-
build:
45-
context: build/dist/php
46-
args:
47-
- FROM_TAG=php72-fpm
48-
environment:
49-
- "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
50-
volumes:
51-
- dockerdev-workspace-volume:/data
52-
php73:
53-
build:
54-
context: build/dist/php
55-
args:
56-
- FROM_TAG=php73-fpm
57-
environment:
58-
- "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
59-
volumes:
60-
- dockerdev-workspace-volume:/data
22+
# php56:
23+
# build:
24+
# context: build/dist/php
25+
# args:
26+
# - FROM_TAG=php5-fpm
27+
# volumes:
28+
# - dockerdev-workspace-volume:/data
29+
# php70:
30+
# build:
31+
# context: build/dist/php
32+
# args:
33+
# - FROM_TAG=php7-fpm
34+
# volumes:
35+
# - dockerdev-workspace-volume:/data
36+
# php71:
37+
# build:
38+
# context: build/dist/php
39+
# args:
40+
# - FROM_TAG=php71-fpm
41+
# volumes:
42+
# - dockerdev-workspace-volume:/data
43+
# php72:
44+
# build:
45+
# context: build/dist/php
46+
# args:
47+
# - FROM_TAG=php72-fpm
48+
# environment:
49+
# - "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
50+
# volumes:
51+
# - dockerdev-workspace-volume:/data
52+
# php73:
53+
# build:
54+
# context: build/dist/php
55+
# args:
56+
# - FROM_TAG=php73-fpm
57+
# environment:
58+
# - "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
59+
# volumes:
60+
# - dockerdev-workspace-volume:/data
6161
php74:
6262
build:
6363
context: build/dist/php
@@ -103,6 +103,15 @@ services:
103103
- "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
104104
volumes:
105105
- dockerdev-workspace-volume:/data
106+
php84:
107+
build:
108+
context: build/dist/php
109+
args:
110+
- FROM_TAG=php84-fpm
111+
environment:
112+
- "BLACKFIRE_AGENT_SOCKET=unix:///dev/null"
113+
volumes:
114+
- dockerdev-workspace-volume:/data
106115

107116
redis:
108117
image: redis:alpine

0 commit comments

Comments
 (0)