Skip to content

Commit 1205d28

Browse files
committed
Remove 7.4 support
1 parent d7d548d commit 1205d28

6 files changed

+6
-263
lines changed

7.4/Dockerfile

-144
This file was deleted.

7.4/blackfire-install.sh

-34
This file was deleted.

7.4/craft-cms-xdebug.ini

-1
This file was deleted.

7.4/craft-cms.ini

-14
This file was deleted.

7.4/dev.Dockerfile

-32
This file was deleted.

Makefile

+6-38
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ all-cli:
1414
--build-arg PHP_VERSION=8.0 \
1515
--build-arg PROJECT_TYPE=cli \
1616
-t craftcms/cli:8.0 8.0
17-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
18-
--build-arg PHP_VERSION=7.4 \
19-
--build-arg PROJECT_TYPE=cli \
20-
-t craftcms/cli:7.4 7.4
2117

2218
all-cli-dev:
2319
docker buildx build --load --platform linux/amd64 --builder all-platforms \
@@ -30,11 +26,6 @@ all-cli-dev:
3026
--build-arg PHP_VERSION=8.0 \
3127
--build-arg PROJECT_TYPE=cli \
3228
-t craftcms/cli:8.0-dev 8.0
33-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
34-
-f 7.4/dev.Dockerfile \
35-
--build-arg PHP_VERSION=7.4 \
36-
--build-arg PROJECT_TYPE=cli \
37-
-t craftcms/cli:7.4-dev 7.4
3829

3930
all-php-fpm:
4031
docker buildx build --load --platform linux/amd64 --builder all-platforms \
@@ -45,10 +36,6 @@ all-php-fpm:
4536
--build-arg PHP_VERSION=8.0 \
4637
--build-arg PROJECT_TYPE=fpm \
4738
-t craftcms/php-fpm:8.0 8.0
48-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
49-
--build-arg PHP_VERSION=7.4 \
50-
--build-arg PROJECT_TYPE=fpm \
51-
-t craftcms/php-fpm:7.4 7.4
5239

5340
all-php-fpm-dev:
5441
docker buildx build --load --platform linux/amd64 --builder all-platforms \
@@ -61,11 +48,6 @@ all-php-fpm-dev:
6148
--build-arg PHP_VERSION=8.0 \
6249
--build-arg PROJECT_TYPE=php-fpm \
6350
-t craftcms/php-fpm:8.0-dev 8.0
64-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
65-
-f 7.4/dev.Dockerfile \
66-
--build-arg PHP_VERSION=7.4 \
67-
--build-arg PROJECT_TYPE=php-fpm \
68-
-t craftcms/php-fpm:7.4-dev 7.4
6951

7052
all-nginx:
7153
docker buildx build --load --platform linux/amd64 --builder all-platforms \
@@ -74,10 +56,6 @@ all-nginx:
7456
docker buildx build --load --platform linux/amd64 --builder all-platforms \
7557
--build-arg PHP_VERSION=8.0 \
7658
-t craftcms/nginx:8.0 nginx
77-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
78-
--build-arg PHP_VERSION=7.4 \
79-
-t craftcms/nginx:7.4 nginx
80-
8159

8260
all-nginx-dev:
8361
docker buildx build --load --platform linux/amd64 --builder all-platforms \
@@ -88,10 +66,6 @@ all-nginx-dev:
8866
--build-arg PHP_VERSION=8.0 \
8967
--build-arg NGINX_CONF=dev.default.conf \
9068
-t craftcms/nginx:8.0-dev nginx
91-
docker buildx build --load --platform linux/amd64 --builder all-platforms \
92-
--build-arg PHP_VERSION=7.4 \
93-
--build-arg NGINX_CONF=dev.default.conf \
94-
-t craftcms/nginx:7.4-dev nginx
9569

9670
setup:
9771
docker buildx create --name all-platforms --platform linux/amd64,linux/arm64
@@ -154,35 +128,29 @@ snyk-local:
154128
snyk-all-cli:
155129
snyk container test \
156130
craftcms/cli:8.1 \
157-
craftcms/cli:8.0 \
158-
craftcms/cli:7.4
131+
craftcms/cli:8.0
159132

160133
snyk-all-cli-dev:
161134
snyk container test \
162135
craftcms/cli:8.1-dev \
163-
craftcms/cli:8.0-dev \
164-
craftcms/cli:7.4-dev
136+
craftcms/cli:8.0-dev
165137

166138
snyk-all-php-fpm:
167139
snyk container test \
168140
craftcms/php-fpm:8.1 \
169-
craftcms/php-fpm:8.0 \
170-
craftcms/php-fpm:7.4
141+
craftcms/php-fpm:8.0
171142

172143
snyk-all-php-fpm-dev:
173144
snyk container test \
174145
craftcms/php-fpm:8.1-dev \
175-
craftcms/php-fpm:8.0-dev \
176-
craftcms/php-fpm:7.4-dev
146+
craftcms/php-fpm:8.0-dev
177147

178148
snyk-all-nginx:
179149
snyk container test \
180150
craftcms/nginx:8.1 \
181-
craftcms/nginx:8.0 \
182-
craftcms/nginx:7.4
151+
craftcms/nginx:8.0
183152

184153
snyk-all-nginx-dev:
185154
snyk container test \
186155
craftcms/nginx:8.1-dev \
187-
craftcms/nginx:8.0-dev \
188-
craftcms/nginx:7.4-dev
156+
craftcms/nginx:8.0-dev

0 commit comments

Comments
 (0)