update os version [3]

matyhtf · matyhtf · commit 7a8cbb1c5291 · 2023-05-16T20:28:14.000+08:00
diff --git a/7.2-alpine/Dockerfile b/7.2-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.2-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.2-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/7.3-alpine/Dockerfile b/7.3-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.3-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.3-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/7.4-alpine/Dockerfile b/7.4-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.4-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:7.4-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.0-alpine/Dockerfile b/8.0-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.0-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.0-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.1-alpine/Dockerfile b/8.1-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.1-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.1/Dockerfile b/8.1/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.1-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/8.2-alpine/Dockerfile b/8.2-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.2-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.2-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/generator b/generator
@@ -1,32 +1,42 @@
 #!/usr/bin/env php
 <?php
 
-function render($tag, $type)
+const alpine_version = '3.18';
+const debian_version = 'bullseye';
+
+function render($version, $type)
 {
-    $v = strstr($tag, '-', true) ?: $tag;
+    $v = strstr($version, '-', true) ?: $version;
     if (version_compare($v, '8.0', '>=') or $v == 'rc' or $v == 'latest' or $v == 'alpine') {
         $CFLAGS = 'CFLAGS="$CFLAGS -D_GNU_SOURCE"';
     } else {
         $CFLAGS = '';
     }
 
+    $alpine = str_contains($version, 'alpine');
+    if (!$alpine) {
+        $tag = $version === 'latest' ? debian_version : $version . '-' . debian_version;
+    } else {
+        $tag = $version . alpine_version;
+    }
+
     ob_start();
     include __DIR__ . '/templates/' . $type . '.php';
     $content = ob_get_clean();
-    $dockerFile = __DIR__ . '/' . $tag . '/Dockerfile';
+    $dockerFile = __DIR__ . '/' . $version . '/Dockerfile';
 
     if (!is_dir(dirname($dockerFile))) {
         mkdir(dirname($dockerFile));
     }
     file_put_contents($dockerFile, $content);
 }
 
-$debian_tags = ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', 'rc', 'latest'];
-foreach ($debian_tags as $tag) {
-    render($tag, 'debian');
+$debian_versions = ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', 'rc', 'latest'];
+foreach ($debian_versions as $v) {
+    render($v, 'debian');
 }
 
-$alpine_tags = ['7.2-alpine', '7.3-alpine', '7.4-alpine', '8.0-alpine', '8.1-alpine', '8.2-alpine', 'rc-alpine', 'alpine'];
-foreach ($alpine_tags as $tag) {
-    render($tag, 'alpine');
+$alpine_versions = ['7.2-alpine', '7.3-alpine', '7.4-alpine', '8.0-alpine', '8.1-alpine', '8.2-alpine', 'rc-alpine', 'alpine'];
+foreach ($alpine_versions as $v) {
+    render($v, 'alpine');
 }
diff --git a/latest/Dockerfile b/latest/Dockerfile
@@ -1,5 +1,4 @@
-FROM php:latest-bullseye
-
+FROM php:bullseye
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/rc-alpine/Dockerfile b/rc-alpine/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:rc-alpine3.18
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apk update
diff --git a/rc/Dockerfile b/rc/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:rc-bullseye
-
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
 RUN apt update -y
diff --git a/templates/alpine.php b/templates/alpine.php
@@ -1,4 +1,4 @@
-FROM php:<?=$tag?>3.18
+FROM php:<?=$tag?>
 
 LABEL maintainer="Swoole Team <team@swoole.com>"
 
diff --git a/templates/debian.php b/templates/debian.php
@@ -1,4 +1,4 @@
-FROM php:<?=$tag?>-bullseye
+FROM php:<?=$tag?>
 
 LABEL maintainer="Swoole Team <team@swoole.com>"
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.2-alpine3.18`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.2-bullseye`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.3-alpine3.18`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.3-bullseye`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.4-alpine3.18`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:7.4-bullseye`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:8.0-alpine3.18`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:8.0-bullseye`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apt update -y`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:8.1-alpine3.18`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apk update`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`FROM php:8.1-bullseye`
`2`		`-`
`3`	`2`	`LABEL maintainer="Swoole Team <[email protected]>"`
`4`	`3`
`5`	`4`	`RUN apt update -y`