Skip to content

Commit 9546a7d

Browse files
committed
update os version [4]
1 parent 7a8cbb1 commit 9546a7d

File tree

9 files changed

+21
-10
lines changed

9 files changed

+21
-10
lines changed

7.2-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.2-alpine3.18
1+
FROM php:7.2-alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

7.2/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.2-bullseye
1+
FROM php:7.2
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apt update -y

7.3-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.3-alpine3.18
1+
FROM php:7.3-alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

7.4-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4-alpine3.18
1+
FROM php:7.4-alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

8.0-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:8.0-alpine3.18
1+
FROM php:8.0-alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:alpine3.18
1+
FROM php:alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

generator

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@ function render($version, $type)
1515

1616
$alpine = str_contains($version, 'alpine');
1717
if (!$alpine) {
18-
$tag = $version === 'latest' ? debian_version : $version . '-' . debian_version;
18+
// 7.2 does not have bullseye
19+
if ($version === '7.2') {
20+
$tag = $version;
21+
} elseif ($version === 'rc' or $version == 'latest') {
22+
$tag = debian_version;
23+
} else {
24+
$tag = $version . '-' . debian_version;
25+
}
1926
} else {
20-
$tag = $version . alpine_version;
27+
if (version_compare($v, '8.1', '>=')) {
28+
$tag = $version . alpine_version;
29+
} else {
30+
$tag = $version;
31+
}
2132
}
2233

2334
ob_start();

rc-alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:rc-alpine3.18
1+
FROM php:rc-alpine
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apk update

rc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:rc-bullseye
1+
FROM php:bullseye
22
LABEL maintainer="Swoole Team <[email protected]>"
33

44
RUN apt update -y

0 commit comments

Comments
 (0)