From 6fcc7ad6a48a4b3728d4fbe37b4a4cb3eca46ccc Mon Sep 17 00:00:00 2001 From: Odboy Date: Sun, 15 Nov 2026 09:40:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20runtime-tomcat10?= =?UTF-8?q?=20=E9=95=9C=E5=83=8F=E4=B8=8E=20java=20=E7=A4=BA=E4=BE=8B?= =?UTF-8?q?=EF=BC=88springboot-jar17=20/=20spring-war17=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 +- demo/spring-war17/.dockerignore | 3 + demo/spring-war17/.gitignore | 3 + demo/spring-war17/Dockerfile | 25 +++++ demo/spring-war17/README.md | 96 +++++++++++++++++++ demo/spring-war17/build.sh | 11 +++ demo/spring-war17/docker-compose.yml | 30 ++++++ demo/spring-war17/pom.xml | 70 ++++++++++++++ demo/spring-war17/shutdown.sh | 4 + .../java/cn/odboy/demo/DemoController.java | 75 +++++++++++++++ .../java/cn/odboy/demo/PageController.java | 28 ++++++ .../java/cn/odboy/demo/WebAppInitializer.java | 25 +++++ .../main/java/cn/odboy/demo/WebConfig.java | 50 ++++++++++ .../src/main/resources/templates/index.html | 27 ++++++ .../src/main/webapp/WEB-INF/web.xml | 19 ++++ demo/spring-war17/startup.sh | 4 + demo/springboot-jar17/.dockerignore | 4 + demo/springboot-jar17/.gitignore | 3 + demo/springboot-jar17/Dockerfile | 22 +++++ demo/springboot-jar17/README.md | 91 ++++++++++++++++++ demo/springboot-jar17/build.sh | 11 +++ demo/springboot-jar17/docker-compose.yml | 30 ++++++ demo/springboot-jar17/pom.xml | 53 ++++++++++ demo/springboot-jar17/shutdown.sh | 4 + .../java/cn/odboy/demo/BootRuntimeInfo.java | 21 ++++ .../java/cn/odboy/demo/DemoApplication.java | 12 +++ .../java/cn/odboy/demo/DemoController.java | 88 +++++++++++++++++ .../java/cn/odboy/demo/PageController.java | 28 ++++++ .../src/main/resources/application.yml | 26 +++++ .../src/main/resources/templates/index.html | 27 ++++++ demo/springboot-jar17/startup.sh | 4 + image/runtime-tomcat10/.dockerignore | 5 + image/runtime-tomcat10/.gitignore | 4 + image/runtime-tomcat10/Dockerfile | 22 +++++ image/runtime-tomcat10/build.sh | 21 ++++ 35 files changed, 953 insertions(+), 2 deletions(-) create mode 100644 demo/spring-war17/.dockerignore create mode 100644 demo/spring-war17/.gitignore create mode 100644 demo/spring-war17/Dockerfile create mode 100644 demo/spring-war17/README.md create mode 100755 demo/spring-war17/build.sh create mode 100644 demo/spring-war17/docker-compose.yml create mode 100644 demo/spring-war17/pom.xml create mode 100755 demo/spring-war17/shutdown.sh create mode 100644 demo/spring-war17/src/main/java/cn/odboy/demo/DemoController.java create mode 100644 demo/spring-war17/src/main/java/cn/odboy/demo/PageController.java create mode 100644 demo/spring-war17/src/main/java/cn/odboy/demo/WebAppInitializer.java create mode 100644 demo/spring-war17/src/main/java/cn/odboy/demo/WebConfig.java create mode 100644 demo/spring-war17/src/main/resources/templates/index.html create mode 100644 demo/spring-war17/src/main/webapp/WEB-INF/web.xml create mode 100755 demo/spring-war17/startup.sh create mode 100644 demo/springboot-jar17/.dockerignore create mode 100644 demo/springboot-jar17/.gitignore create mode 100644 demo/springboot-jar17/Dockerfile create mode 100644 demo/springboot-jar17/README.md create mode 100755 demo/springboot-jar17/build.sh create mode 100644 demo/springboot-jar17/docker-compose.yml create mode 100644 demo/springboot-jar17/pom.xml create mode 100755 demo/springboot-jar17/shutdown.sh create mode 100644 demo/springboot-jar17/src/main/java/cn/odboy/demo/BootRuntimeInfo.java create mode 100644 demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoApplication.java create mode 100644 demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoController.java create mode 100644 demo/springboot-jar17/src/main/java/cn/odboy/demo/PageController.java create mode 100644 demo/springboot-jar17/src/main/resources/application.yml create mode 100644 demo/springboot-jar17/src/main/resources/templates/index.html create mode 100755 demo/springboot-jar17/startup.sh create mode 100644 image/runtime-tomcat10/.dockerignore create mode 100644 image/runtime-tomcat10/.gitignore create mode 100644 image/runtime-tomcat10/Dockerfile create mode 100755 image/runtime-tomcat10/build.sh diff --git a/README.md b/README.md index 984518e..3520e4f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ``` image/ 自建镜像:每个目录 = Dockerfile + build.sh,目录名即镜像 tag deploy/ 部署编排:三方镜像 + 自研的 docker-compose / 配置,每个目录 = docker-compose.yml + startup.sh / shutdown.sh + README.md(+demo.png) -demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotnet6/8/9、python310-flask、tengine3) +demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotnet6/8/9、python310-flask、springboot-jar17、spring-war17、tengine3) ``` ### 使用约定 @@ -29,6 +29,7 @@ demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotn | `image/runtime-jdk17` | `kenaito:runtime-jdk17` | 上者 / JDK 17 | 运行环境,仅 JDK | | `image/runtime-jdk21` | `kenaito:runtime-jdk21` | 上者 / JDK 21.0.2 | 运行环境,仅 JDK | | `image/runtime-python310` | `kenaito:runtime-python310` | 上者 / Python 3.10.0 | 运行环境,Python + pip 源(`pip.conf`) | +| `image/runtime-tomcat10` | `kenaito:runtime-tomcat10` | `runtime-jdk17` / Tomcat 10.1.34 | 运行环境,JDK 17 + Tomcat(war 包部署用),兼容 Spring 6 | | `image/runtime-dotnet6` | `kenaito:runtime-dotnet6` | 上者 / ASP.NET Core 运行时 6.0.35 | 运行环境,仅运行时 | | `image/runtime-dotnet8` | `kenaito:runtime-dotnet8` | 上者 / ASP.NET Core 运行时 8.0.x | 运行环境,仅运行时 | | `image/runtime-dotnet9` | `kenaito:runtime-dotnet9` | 上者 / ASP.NET Core 运行时 9.0.x | 运行环境,仅运行时 | @@ -82,6 +83,8 @@ demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotn | [`demo/dotnet8`](demo/dotnet8/README.md) | `compile-dotnet8` / `runtime-dotnet8` | 8081 | .NET 8 两阶段构建示例 | | [`demo/dotnet9`](demo/dotnet9/README.md) | `compile-dotnet9` / `runtime-dotnet9` | 8082 | .NET 9 两阶段构建示例 | | [`demo/python310-flask`](demo/python310-flask/README.md) | `runtime-python310` | 8083 | Python 3.10 + Flask 3.0 单阶段构建示例 | +| [`demo/springboot-jar17`](demo/springboot-jar17/README.md) | `compile-maven3-jdk17` / `runtime-jdk17` | 8084 | Spring Boot 3.4 可执行 jar 两阶段构建示例 | +| [`demo/spring-war17`](demo/spring-war17/README.md) | `compile-maven3-jdk17` / `tomcat:10.1-jdk17` | 8085 | Spring MVC 6 war 包 + 外置 Tomcat 10.1 两阶段构建示例 | | [`demo/tengine3`](demo/tengine3/README.md) | `proxy-tengine3` | 80、443 | Tengine 3.1.0 反向代理示例,证书与站点配置挂载目录 | @@ -90,6 +93,8 @@ demo/ 构建示例:基于 image/ 下的镜像做构建与运行演示(dotn - 编译:`runtime-dotnet*` 之上的 `compile-dotnet*` - 运行:`runtime-dotnet*` - java 适用于 java 应用 - - 编译与运行:`runtime-jdk*`(含 JDK,可直接编译后运行) + - 编译:`compile-maven3-jdk17` / `-jdk21` / `-jdk25`(JDK + Maven,按目标字节码版本选) + - 运行:`runtime-jdk*`(仅 JDK,直接 `java -jar` 或作为外置 Tomcat 的基础镜像) + - war 包运行:`runtime-tomcat10`(JDK 17 + Tomcat 10.1,兼容 Spring 6 / Servlet 6) - python 适用于 python 应用 - 编译与运行:`runtime-python310`(已配置 pip 镜像源) diff --git a/demo/spring-war17/.dockerignore b/demo/spring-war17/.dockerignore new file mode 100644 index 0000000..5c3ba1e --- /dev/null +++ b/demo/spring-war17/.dockerignore @@ -0,0 +1,3 @@ +target/ +.git/ +.DS_Store diff --git a/demo/spring-war17/.gitignore b/demo/spring-war17/.gitignore new file mode 100644 index 0000000..ec10551 --- /dev/null +++ b/demo/spring-war17/.gitignore @@ -0,0 +1,3 @@ +target/ +.idea/ +*.iml diff --git a/demo/spring-war17/Dockerfile b/demo/spring-war17/Dockerfile new file mode 100644 index 0000000..e01bf56 --- /dev/null +++ b/demo/spring-war17/Dockerfile @@ -0,0 +1,25 @@ +# 编译阶段:compile-maven3-jdk17(JDK 17 + Maven 3.9.9 + 阿里云 Maven 源) +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17 AS build +WORKDIR /src + +# 先只拷贝 POM 预热依赖层:源码改动不会让依赖缓存失效 +COPY pom.xml ./ +RUN mvn -B -q dependency:go-offline + +COPY src ./src +RUN mvn -B -q clean package -DskipTests + +# 运行阶段:外置 Tomcat 10.1(Servlet 6.0 / Jakarta EE 10,对应 Spring 6),仅含 JDK 17 运行时 +FROM tomcat:10.1-jdk17-temurin AS runtime +LABEL MAINTAINER="tianjun@odboy.cn" +ENV TimeZone=Asia/Shanghai +# 清掉官方镜像自带的 welcome 应用,只部署本示例 +RUN rm -rf /usr/local/tomcat/webapps/* \ + && ln -snf /usr/share/zoneinfo/${TimeZone} /etc/localtime + +# 带版本号的 war 改名后部署,上下文路径 = /spring-war17 +COPY --from=build /src/target/spring-war17.war /usr/local/tomcat/webapps/spring-war17.war + +EXPOSE 8080 +# exec 形式:catalina.sh run 在前台运行,SIGTERM 可正常触发 Tomcat 优雅停机 +ENTRYPOINT ["catalina.sh", "run"] diff --git a/demo/spring-war17/README.md b/demo/spring-war17/README.md new file mode 100644 index 0000000..1edab59 --- /dev/null +++ b/demo/spring-war17/README.md @@ -0,0 +1,96 @@ +# spring-war17 示例 + +演示如何用 `compile-maven3-jdk17` 打出 **war 包**,再部署到外置 Tomcat 10.1 运行。与 +[`demo/springboot-jar17`](../springboot-jar17/README.md) 对照:应用代码几乎一样,区别只在打包方式与运行容器。 + +| 阶段 | 镜像 | 说明 | +| --- | --- | --- | +| 编译 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17` | JDK 17 + Maven 3.9.9 + 阿里云 Maven 源(见 `image/compile-maven3-jdk17`) | +| 运行 | `tomcat:10.1-jdk17-temurin`(Docker Hub 官方镜像) | Servlet 6.0 / Jakarta EE 10,自带 JDK 17 运行时;仓库内暂无自建 Tomcat 镜像 | + +> Spring 6 要求 Jakarta EE 9+,即 **Tomcat 10.1 及以上**;Tomcat 9(`javax.servlet`)跑不了本示例。 + +### 示例内容 + +``` +spring-war17/ +├── pom.xml # packaging=war,Spring 6.2.1 + Thymeleaf 3.1,不依赖 Boot +├── src/main/java/cn/odboy/demo/ +│ ├── WebAppInitializer.java # 替代 web.xml,注册 DispatcherServlet(映射 /api/*) +│ ├── WebConfig.java # @EnableWebMvc + Thymeleaf 视图解析 + Jackson +│ ├── DemoController.java # @RestController:/ 、/info、/hello/{name}(在 /api 前缀下) +│ └── PageController.java # @Controller:/api/page 渲染模板 +├── src/main/resources/templates/index.html +├── src/main/webapp/WEB-INF/web.xml # 仅声明 metadata-complete=false 与会话超时,无 servlet 映射 +├── Dockerfile # 两阶段:compile-maven3-jdk17 -> tomcat:10.1-jdk17-temurin +├── build.sh # 构建镜像(PUSH=1 时同时推送) +├── docker-compose.yml # 部署编排(8085 -> 容器 8080,固定 IP 172.30.2.20) +├── startup.sh # docker-compose up -d +└── shutdown.sh # docker-compose down +``` + +### 构建与部署 + +```shell +sh build.sh # docker build -t registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-spring-war17 . +PUSH=1 sh build.sh # 构建并推送 +sh startup.sh # docker-compose -f docker-compose.yml -p spring-war17-demo up -d +``` + +war 部署后上下文路径为 **`/spring-war17`**,接口都在该前缀下: + +```shell +curl http://127.0.0.1:8085/spring-war17/api/ # {"message":"spring-war17 is running","java":"17.0.x",...} +curl http://127.0.0.1:8085/spring-war17/api/info # 同上 +curl http://127.0.0.1:8085/spring-war17/api/hello/demo +``` + +浏览器打开 http://127.0.0.1:8085/spring-war17/api/page 可看到渲染后的运行信息页面。 + +### 关键点 + +**没有 servlet 映射的 web.xml**:`WebAppInitializer` 继承 `AbstractAnnotationConfigDispatcherServletInitializer`, +Tomcat 通过 Servlet 3+ 的 `ServletContainerInitializer` 机制自动发现它并注册 DispatcherServlet。 +`src/main/webapp/WEB-INF/web.xml` 只声明 `metadata-complete="false"` 和会话超时,不写任何 servlet 映射; +`maven-war-plugin` 设置了 `failOnMissingWebXml=false`,即使删掉它也能打包。 + +**DispatcherServlet 只映射 `/api/*`**:`/api` 前缀外的请求仍由 Tomcat 默认 Servlet 处理(404 或欢迎页), +避免传统 war 里 DispatcherServlet 抢占 `/` 后静态资源失效。`web.xml` 式项目可以同样用 `/api/*`。 + +**context.xml**:`src/main/webapp/META-INF/context.xml` 只是占位文件,用来把该目录纳入构建上下文; +它不参与启动流程,删掉不影响运行。 + +**上下文路径**:war 文件名即上下文路径,`finalName` 固定为 `spring-war17`,所以是 `/spring-war17`。 +想让应用直接挂在根路径 `/`,把 war 改名为 `ROOT.war` 即可。 + +**两阶段构建**:build 阶段在 `compile-maven3-jdk17` 里 `mvn package`,runtime 阶段只把 war 拷进官方 Tomcat 镜像, +运行镜像不含 Maven/源码。Tomcat 镜像保留官方默认布局,只清空自带 `webapps/*`。 + +**端口**:容器内 Tomcat 仍是 8080(官方镜像默认),宿主机映射到 8085。 + +**健康检查**:compose 用 `curl` 探测 `/spring-war17/api/info`,`start_period: 30s` 覆盖 war 解压与 Spring 初始化; +temurin 镜像自带 curl,无需额外安装。 + +### 运维命令 + +```shell +docker logs -f spring-war17-demo # catalina.out 日志 +docker exec spring-war17-demo ls /usr/local/tomcat/webapps # 查看已部署应用(war 与解包目录) +docker exec spring-war17-demo java -version # 确认 JDK 版本 +``` + +### 调试时直接在编译镜像里跑 + +```shell +docker run --rm -it -v "$PWD":/src -w /src \ + registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17 \ + mvn -B clean package +``` + +得到的 `target/spring-war17.war` 可以拷到任意 Tomcat 10.1 的 `webapps/` 下部署。 + +### 停止 + +```shell +sh shutdown.sh +``` diff --git a/demo/spring-war17/build.sh b/demo/spring-war17/build.sh new file mode 100755 index 0000000..04b9cbd --- /dev/null +++ b/demo/spring-war17/build.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# 在示例目录下构建示例镜像(编译 + 运行两阶段均在本机 docker 内完成) +set -euo pipefail +cd "$(dirname "$0")" + +IMAGE=${IMAGE:-registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-spring-war17} +docker build -t "${IMAGE}" . + +if [ "${PUSH:-0}" = "1" ]; then + docker push "${IMAGE}" +fi diff --git a/demo/spring-war17/docker-compose.yml b/demo/spring-war17/docker-compose.yml new file mode 100644 index 0000000..8a4705b --- /dev/null +++ b/demo/spring-war17/docker-compose.yml @@ -0,0 +1,30 @@ +version: '3.8' + +networks: + spring-war17-demo: + ipam: + driver: default + config: + - subnet: "172.30.2.0/24" + +services: + demo: + image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-spring-war17 # 镜像由 build.sh 构建 + container_name: spring-war17-demo + restart: unless-stopped + ports: # 映射端口:8085 -> 容器内 Tomcat 8080 + - "8085:8080" + environment: # 设置环境变量,相当于docker run命令中的-e + TZ: Asia/Shanghai + JAVA_OPTS: "-Xms128m -Xmx256m -Duser.timezone=Asia/Shanghai" + CATALINA_OPTS: "-Djava.security.egd=file:/dev/./urandom" + healthcheck: + # temurin 镜像自带 curl,直接探测健康页面;start_period 覆盖 war 解压与 Spring 初始化 + test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:8080/spring-war17/api/info > /dev/null"] + interval: 30s + timeout: 5s + retries: 3 + start_period: 30s + networks: + spring-war17-demo: + ipv4_address: 172.30.2.20 diff --git a/demo/spring-war17/pom.xml b/demo/spring-war17/pom.xml new file mode 100644 index 0000000..6255754 --- /dev/null +++ b/demo/spring-war17/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + cn.odboy + spring-war17 + 1.0.0 + + war + spring-war17 + Spring MVC 6 + 外置 Tomcat 10.1 的 war 包示例 + + + 17 + ${java.version} + UTF-8 + 6.2.1 + 3.1.2.RELEASE + 3.1.2.RELEASE + 6.0.0 + + + + + + org.springframework + spring-webmvc + ${spring.version} + + + org.thymeleaf + thymeleaf-spring6 + ${thymeleaf-spring6.version} + + + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} + provided + + + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + ${java.version} + + + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + false + + + + + + diff --git a/demo/spring-war17/shutdown.sh b/demo/spring-war17/shutdown.sh new file mode 100755 index 0000000..a621363 --- /dev/null +++ b/demo/spring-war17/shutdown.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p spring-war17-demo down diff --git a/demo/spring-war17/src/main/java/cn/odboy/demo/DemoController.java b/demo/spring-war17/src/main/java/cn/odboy/demo/DemoController.java new file mode 100644 index 0000000..1bf7c6d --- /dev/null +++ b/demo/spring-war17/src/main/java/cn/odboy/demo/DemoController.java @@ -0,0 +1,75 @@ +package cn.odboy.demo; + +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.time.Duration; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.LinkedHashMap; +import java.util.Map; + +import jakarta.servlet.ServletContext; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.SpringVersion; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +/** + * 运行时信息接口。与 demo/springboot-jar17 里的同名类保持一致的输出结构,方便对比 jar 与 war 两种打包方式。 + */ +@RestController +public class DemoController { + + private static final ZoneId TZ8 = ZoneId.of("Asia/Shanghai"); + private static final DateTimeFormatter TIME_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss XXX"); + + @Autowired(required = false) + private ServletContext servletContext; + + @GetMapping({"/", "/info"}) + public Map info() { + Runtime runtime = Runtime.getRuntime(); + long uptimeMillis = ManagementFactory.getRuntimeMXBean().getUptime(); + + Map body = new LinkedHashMap<>(); + body.put("message", "spring-war17 is running"); + body.put("java", System.getProperty("java.version")); + body.put("javaHome", System.getProperty("java.home")); + body.put("vm", System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version")); + body.put("spring", SpringVersion.getVersion()); + body.put("application", "Spring MVC " + SpringVersion.getVersion() + " + " + servletContextName()); + body.put("os", System.getProperty("os.name") + " " + System.getProperty("os.arch")); + body.put("hostname", hostname()); + body.put("contextPath", servletContext == null ? "" : servletContext.getContextPath()); + body.put("zoneId", ZoneId.systemDefault().getId()); + body.put("time", ZonedDateTime.now(TZ8).format(TIME_FMT)); + body.put("uptime", Duration.ofMillis(uptimeMillis).toString()); + body.put("memory", runtime.totalMemory() / 1024 / 1024 + "MB / max " + runtime.maxMemory() / 1024 / 1024 + "MB"); + return body; + } + + @GetMapping("/hello/{name}") + public Map hello(@PathVariable String name) { + Map body = new LinkedHashMap<>(); + body.put("message", "Hello, " + name + "!"); + body.put("time", ZonedDateTime.now(TZ8).format(TIME_FMT)); + return body; + } + + private String servletContextName() { + if (servletContext == null) { + return "Tomcat"; + } + return servletContext.getServerInfo(); + } + + private static String hostname() { + try { + return InetAddress.getLocalHost().getHostName(); + } catch (Exception e) { + return "unknown"; + } + } +} diff --git a/demo/spring-war17/src/main/java/cn/odboy/demo/PageController.java b/demo/spring-war17/src/main/java/cn/odboy/demo/PageController.java new file mode 100644 index 0000000..be3dc0a --- /dev/null +++ b/demo/spring-war17/src/main/java/cn/odboy/demo/PageController.java @@ -0,0 +1,28 @@ +package cn.odboy.demo; + +import java.util.Map; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 页面路由,模板见 src/main/resources/templates/index.html。 + */ +@Controller +public class PageController { + + private final DemoController demoController; + + public PageController(DemoController demoController) { + this.demoController = demoController; + } + + /** 渲染 templates/index.html;/api/page 返回页面,其它 /api/* 仍返回 JSON */ + @GetMapping("/page") + public String page(Model model) { + Map info = demoController.info(); + model.addAttribute("info", info); + return "index"; + } +} diff --git a/demo/spring-war17/src/main/java/cn/odboy/demo/WebAppInitializer.java b/demo/spring-war17/src/main/java/cn/odboy/demo/WebAppInitializer.java new file mode 100644 index 0000000..9456d12 --- /dev/null +++ b/demo/spring-war17/src/main/java/cn/odboy/demo/WebAppInitializer.java @@ -0,0 +1,25 @@ +package cn.odboy.demo; + +import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; + +/** + * 替代 web.xml:Tomcat 10.1 启动时通过 Servlet 3+ 的 ServiceLoader 发现本类, + * 由它注册 DispatcherServlet 与根容器。前缀 /api 的请求进 Spring MVC,其余请求交给 Tomcat 默认 Servlet。 + */ +public class WebAppInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { + + @Override + protected Class[] getRootConfigClasses() { + return null; + } + + @Override + protected Class[] getServletConfigClasses() { + return new Class[]{WebConfig.class}; + } + + @Override + protected String[] getServletMappings() { + return new String[]{"/api/*"}; + } +} diff --git a/demo/spring-war17/src/main/java/cn/odboy/demo/WebConfig.java b/demo/spring-war17/src/main/java/cn/odboy/demo/WebConfig.java new file mode 100644 index 0000000..b9101dd --- /dev/null +++ b/demo/spring-war17/src/main/java/cn/odboy/demo/WebConfig.java @@ -0,0 +1,50 @@ +package cn.odboy.demo; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ViewResolverRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.thymeleaf.spring6.SpringTemplateEngine; +import org.thymeleaf.spring6.view.ThymeleafViewResolver; +import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; + +import java.util.List; + +/** + * Spring MVC 配置。@EnableWebMvc 负责 JSON 等默认消息转换器,这里额外加上 Thymeleaf 视图解析。 + */ +@Configuration +@EnableWebMvc +@ComponentScan("cn.odboy.demo") +public class WebConfig implements WebMvcConfigurer { + + @Override + public void configureViewResolvers(ViewResolverRegistry registry) { + ClassLoaderTemplateResolver resolver = new ClassLoaderTemplateResolver(); + // 与 springboot-jar17 保持同一套模板路径:src/main/resources/templates/*.html + resolver.setPrefix("templates/"); + resolver.setSuffix(".html"); + resolver.setTemplateMode("HTML"); + resolver.setCharacterEncoding("UTF-8"); + resolver.setCacheable(true); + + SpringTemplateEngine engine = new SpringTemplateEngine(); + engine.setTemplateResolver(resolver); + + ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); + viewResolver.setTemplateEngine(engine); + viewResolver.setCharacterEncoding("UTF-8"); + viewResolver.setOrder(1); + registry.viewResolver(viewResolver); + } + + @Override + public void extendMessageConverters(List> converters) { + // 显式给出 Jackson 转换器,方便后续统一改日期格式等;默认配置已足够 + converters.add(new MappingJackson2HttpMessageConverter(Jackson2ObjectMapperBuilder.json().build())); + } +} diff --git a/demo/spring-war17/src/main/resources/templates/index.html b/demo/spring-war17/src/main/resources/templates/index.html new file mode 100644 index 0000000..d2e0a9c --- /dev/null +++ b/demo/spring-war17/src/main/resources/templates/index.html @@ -0,0 +1,27 @@ + + + + + spring-war17 运行信息 + + + +

spring-war17 运行信息

+ + + + + +
keyvalue
+

+ 其他接口:api/info、api/hello/{name} +

+ + diff --git a/demo/spring-war17/src/main/webapp/WEB-INF/web.xml b/demo/spring-war17/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..ba99c75 --- /dev/null +++ b/demo/spring-war17/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,19 @@ + + + + + spring-war17 + + + 30 + + + diff --git a/demo/spring-war17/startup.sh b/demo/spring-war17/startup.sh new file mode 100755 index 0000000..200cd63 --- /dev/null +++ b/demo/spring-war17/startup.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p spring-war17-demo up -d diff --git a/demo/springboot-jar17/.dockerignore b/demo/springboot-jar17/.dockerignore new file mode 100644 index 0000000..f90f611 --- /dev/null +++ b/demo/springboot-jar17/.dockerignore @@ -0,0 +1,4 @@ +target/ +src/main/webapp/ +.git/ +.DS_Store diff --git a/demo/springboot-jar17/.gitignore b/demo/springboot-jar17/.gitignore new file mode 100644 index 0000000..ec10551 --- /dev/null +++ b/demo/springboot-jar17/.gitignore @@ -0,0 +1,3 @@ +target/ +.idea/ +*.iml diff --git a/demo/springboot-jar17/Dockerfile b/demo/springboot-jar17/Dockerfile new file mode 100644 index 0000000..66b073a --- /dev/null +++ b/demo/springboot-jar17/Dockerfile @@ -0,0 +1,22 @@ +# 编译阶段:compile-maven3-jdk17(JDK 17 + Maven 3.9.9 + 阿里云 Maven 源) +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17 AS build +WORKDIR /src + +# 先只拷贝 POM 预热依赖层:源码改动不会让依赖缓存失效 +COPY pom.xml ./ +RUN mvn -B -q dependency:go-offline + +COPY src ./src +RUN mvn -B -q clean package -DskipTests \ + && cp target/springboot-jar17.jar /src/app.jar + +# 运行阶段:runtime-jdk17(仅 JDK,不含 Maven) +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17 AS runtime +LABEL MAINTAINER="tianjun@odboy.cn" +ENV TimeZone=Asia/Shanghai +ENV APP_PORT=8084 +WORKDIR /home/admin +COPY --from=build /src/app.jar ./ +EXPOSE 8084 +# exec 形式,保证 docker stop 的 SIGTERM 能被 JVM 收到,触发 Spring 优雅停机 +ENTRYPOINT ["java", "-XX:MaxRAMPercentage=75.0", "-Duser.timezone=Asia/Shanghai", "-jar", "/home/admin/app.jar"] diff --git a/demo/springboot-jar17/README.md b/demo/springboot-jar17/README.md new file mode 100644 index 0000000..e73a97b --- /dev/null +++ b/demo/springboot-jar17/README.md @@ -0,0 +1,91 @@ +# springboot-jar17 示例 + +演示如何用 `compile-maven3-jdk17` + `runtime-jdk17` 两阶段构建并运行一个 Spring Boot 3 Web 应用,产物是**可执行 jar**(内嵌 Tomcat)。 + +| 阶段 | 镜像 | 说明 | +| --- | --- | --- | +| 编译 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17` | JDK 17 + Maven 3.9.9 + 阿里云 Maven 源(见 `image/compile-maven3-jdk17`) | +| 运行 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17` | 仅 JDK 17(见 `image/runtime-jdk17`) | + +运行阶段只拷贝 `spring-boot-maven-plugin` 重打包后的 jar,镜像里不含 Maven、源码和 `~/.m2`。 + +### 示例内容 + +``` +springboot-jar17/ +├── pom.xml # Spring Boot 3.4.1,Java 17,parent 统一管版本 +├── src/main/java/cn/odboy/demo/ +│ ├── DemoApplication.java # @SpringBootApplication 入口 +│ ├── DemoController.java # @RestController:/ 、/api/info、/api/hello/{name} +│ ├── PageController.java # @Controller:/page 渲染 Thymeleaf 模板 +│ └── BootRuntimeInfo.java # 输出 Spring Boot 版本号与主机名 +├── src/main/resources/ +│ ├── application.yml # 端口 8084、优雅停机、actuator 只开 health +│ └── templates/index.html # /page 页面 +├── Dockerfile # 两阶段:compile-maven3-jdk17 -> runtime-jdk17 +├── build.sh # 构建镜像(PUSH=1 时同时推送) +├── docker-compose.yml # 部署编排(端口 8084,固定 IP 172.30.1.20) +├── startup.sh # docker-compose up -d +└── shutdown.sh # docker-compose down +``` + +### 构建与部署 + +```shell +sh build.sh # docker build -t registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-springboot-jar17 . +PUSH=1 sh build.sh # 构建并推送 +sh startup.sh # docker-compose -f docker-compose.yml -p springboot-jar17-demo up -d +``` + +访问: + +```shell +curl http://127.0.0.1:8084/ # {"message":"springboot-jar17 is running","java":"17.0.x",...} +curl http://127.0.0.1:8084/api/info # 同上,等价入口 +curl http://127.0.0.1:8084/api/hello/demo # {"message":"Hello, demo!","time":"..."} +curl http://127.0.0.1:8084/actuator/health # {"status":"UP"} +``` + +浏览器打开 http://127.0.0.1:8084/page 可看到渲染后的运行信息页面。 + +### 关键点 + +**依赖层缓存**:先只 `COPY pom.xml` 执行 `mvn dependency:go-offline`,再 `COPY src` 编译。只改源码时不会重新下载依赖; +镜像源已在 `compile-maven3-jdk17` 的 `settings.xml` 里指向阿里云,无需额外换源。 + +**两阶段构建**:Maven 仓库、编译中间产物都留在 build 阶段,最终镜像只多一个 jar。这也是 `runtime-jdk*` 与 `compile-maven3-*` 分开的原因。 + +**监听地址**:容器内 8084(`server.port=${APP_PORT:8084}`),避开 dotnet6/8/9(8080-8082)、python310-flask(8083)、spring-war17(8085)。 + +**时区**:启动参数带 `-Duser.timezone=Asia/Shanghai`,compose 再声明 `TZ`;接口里额外按 UTC+8 输出时间,双保险。 + +**优雅停机**:`server.shutdown=graceful`,`ENTRYPOINT` 用 exec 形式,`docker stop` 的 SIGTERM 直接到 JVM。 + +**内存**:`-XX:MaxRAMPercentage=75.0` 让 JVM 按容器内存上限算堆;compose 里用 `JAVA_OPTS` 演示另一种覆盖方式(需自行在 Dockerfile 里接 `JAVA_OPTS`,本示例入口为固定数组)。 + +### 运维命令 + +```shell +docker logs -f springboot-jar17-demo # 应用日志 +docker exec springboot-jar17-demo java -version # 确认 JDK 版本 +docker exec springboot-jar17-demo sh -c 'ls -lh /home/admin' +``` + +### 调试时直接在编译镜像里运行 + +需要看编译报错或临时跑一下时,可以只挂载源码进编译镜像(Maven 依赖缓存在容器内 `~/.m2`): + +```shell +docker run --rm -it -p 8084:8084 -v "$PWD":/src -w /src \ + registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-maven3-jdk17 \ + mvn spring-boot:run +``` + +想把宿主机的 `~/.m2` 复用到构建里,也可以给 `build.sh` 的 `docker build` 加 +`--build-arg`/`--mount=type=cache,target=/root/.m2` 之类的 BuildKit 缓存(本示例为简单起见未启用)。 + +### 停止 + +```shell +sh shutdown.sh +``` diff --git a/demo/springboot-jar17/build.sh b/demo/springboot-jar17/build.sh new file mode 100755 index 0000000..0d34748 --- /dev/null +++ b/demo/springboot-jar17/build.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# 在示例目录下构建示例镜像(编译 + 运行两阶段均在本机 docker 内完成) +set -euo pipefail +cd "$(dirname "$0")" + +IMAGE=${IMAGE:-registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-springboot-jar17} +docker build -t "${IMAGE}" . + +if [ "${PUSH:-0}" = "1" ]; then + docker push "${IMAGE}" +fi diff --git a/demo/springboot-jar17/docker-compose.yml b/demo/springboot-jar17/docker-compose.yml new file mode 100644 index 0000000..ce35292 --- /dev/null +++ b/demo/springboot-jar17/docker-compose.yml @@ -0,0 +1,30 @@ +version: '3.8' + +networks: + springboot-jar17-demo: + ipam: + driver: default + config: + - subnet: "172.30.1.0/24" + +services: + demo: + image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-springboot-jar17 # 镜像由 build.sh 构建 + container_name: springboot-jar17-demo + restart: unless-stopped + ports: # 映射端口 + - "8084:8084" + environment: # 设置环境变量,相当于docker run命令中的-e + TZ: Asia/Shanghai + APP_PORT: "8084" + JAVA_OPTS: "-Xms128m -Xmx256m" + healthcheck: + # 运行镜像自带 net-tools,直接用端口探测,不额外安装 curl + test: ["CMD-SHELL", "netstat -tln | grep -q ':8084 '"] + interval: 30s + timeout: 5s + retries: 3 + start_period: 30s + networks: + springboot-jar17-demo: + ipv4_address: 172.30.1.20 diff --git a/demo/springboot-jar17/pom.xml b/demo/springboot-jar17/pom.xml new file mode 100644 index 0000000..c13f627 --- /dev/null +++ b/demo/springboot-jar17/pom.xml @@ -0,0 +1,53 @@ + + + 4.0.0 + + + + org.springframework.boot + spring-boot-starter-parent + 3.4.1 + + + + cn.odboy + springboot-jar17 + 1.0.0 + springboot-jar17 + Spring Boot 3 + 内嵌 Tomcat,打成可执行 jar + + + 17 + UTF-8 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-actuator + + + + + ${project.artifactId} + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/demo/springboot-jar17/shutdown.sh b/demo/springboot-jar17/shutdown.sh new file mode 100755 index 0000000..9091055 --- /dev/null +++ b/demo/springboot-jar17/shutdown.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p springboot-jar17-demo down diff --git a/demo/springboot-jar17/src/main/java/cn/odboy/demo/BootRuntimeInfo.java b/demo/springboot-jar17/src/main/java/cn/odboy/demo/BootRuntimeInfo.java new file mode 100644 index 0000000..a0e044a --- /dev/null +++ b/demo/springboot-jar17/src/main/java/cn/odboy/demo/BootRuntimeInfo.java @@ -0,0 +1,21 @@ +package cn.odboy.demo; + +import org.springframework.boot.SpringBootVersion; +import org.springframework.stereotype.Component; + +/** + * Boot 环境下的版本信息实现。 + */ +@Component +public class BootRuntimeInfo implements DemoController.RuntimeInfo { + + @Override + public String appVersion() { + return "Spring Boot " + SpringBootVersion.getVersion(); + } + + @Override + public String hostname() { + return RuntimeInfo.hostnameOrUnknown(); + } +} diff --git a/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoApplication.java b/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoApplication.java new file mode 100644 index 0000000..a941ddc --- /dev/null +++ b/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoApplication.java @@ -0,0 +1,12 @@ +package cn.odboy.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} diff --git a/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoController.java b/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoController.java new file mode 100644 index 0000000..c3686e0 --- /dev/null +++ b/demo/springboot-jar17/src/main/java/cn/odboy/demo/DemoController.java @@ -0,0 +1,88 @@ +package cn.odboy.demo; + +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.time.Duration; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.SpringVersion; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +/** + * 运行时信息接口,用于确认镜像里的 JDK / 时区 / 端口等是否符合预期。 + * 宿主 Profile(含 Boot 版本)通过构造注入,非 Boot 环境传空即可。 + */ +@RestController +public class DemoController { + + private static final ZoneId TZ8 = ZoneId.of("Asia/Shanghai"); + private static final DateTimeFormatter TIME_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss XXX"); + + private final RuntimeInfo host; + + public DemoController(@Autowired(required = false) RuntimeInfo host) { + this.host = host == null ? new RuntimeInfo("", "unknown") : host; + } + + @Value("${app.name:spring demo}") + private String appName; + + @Value("${server.port:0}") + private int port; + + /** 返回 JDK、Spring 版本、主机名、时区与运行时长,浏览器可直接看 JSON */ + @GetMapping({"/", "/api/info"}) + public Map info() { + Runtime runtime = Runtime.getRuntime(); + long uptimeMillis = ManagementFactory.getRuntimeMXBean().getUptime(); + + Map body = new LinkedHashMap<>(); + body.put("message", appName + " is running"); + body.put("java", System.getProperty("java.version")); + body.put("javaHome", System.getProperty("java.home")); + body.put("vm", System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version")); + body.put("spring", SpringVersion.getVersion()); + body.put("application", host.appVersion()); + body.put("os", System.getProperty("os.name") + " " + System.getProperty("os.arch")); + body.put("hostname", host.hostname()); + body.put("port", port); + body.put("zoneId", ZoneId.systemDefault().getId()); + body.put("time", ZonedDateTime.now(TZ8).format(TIME_FMT)); + body.put("uptime", Duration.ofMillis(uptimeMillis).toString()); + body.put("memory", runtime.totalMemory() / 1024 / 1024 + "MB / max " + runtime.maxMemory() / 1024 / 1024 + "MB"); + return body; + } + + /** 带路径参数的示例接口 */ + @GetMapping("/api/hello/{name}") + public Map hello(@PathVariable String name) { + Map body = new LinkedHashMap<>(); + body.put("message", "Hello, " + name + "!"); + body.put("time", ZonedDateTime.now(TZ8).format(TIME_FMT)); + return body; + } + + /** 应用名与版本号;由各示例的实现类提供 */ + public interface RuntimeInfo { + /** 形如 "Spring Boot 3.4.1" 或 "Spring MVC 6.2.1 + Tomcat 10.1.34" */ + String appVersion(); + + String hostname(); + + static String hostnameOrUnknown() { + try { + return InetAddress.getLocalHost().getHostName(); + } catch (Exception e) { + return "unknown"; + } + } + } +} diff --git a/demo/springboot-jar17/src/main/java/cn/odboy/demo/PageController.java b/demo/springboot-jar17/src/main/java/cn/odboy/demo/PageController.java new file mode 100644 index 0000000..69f91c0 --- /dev/null +++ b/demo/springboot-jar17/src/main/java/cn/odboy/demo/PageController.java @@ -0,0 +1,28 @@ +package cn.odboy.demo; + +import java.util.Map; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * 页面路由,模板见 src/main/resources/templates/index.html。 + */ +@Controller +public class PageController { + + private final DemoController demoController; + + public PageController(DemoController demoController) { + this.demoController = demoController; + } + + /** 渲染 templates/index.html;只有 /page 返回页面,接口仍返回 JSON */ + @GetMapping("/page") + public String page(Model model) { + Map info = demoController.info(); + model.addAttribute("info", info); + return "index"; + } +} diff --git a/demo/springboot-jar17/src/main/resources/application.yml b/demo/springboot-jar17/src/main/resources/application.yml new file mode 100644 index 0000000..b2ab942 --- /dev/null +++ b/demo/springboot-jar17/src/main/resources/application.yml @@ -0,0 +1,26 @@ +server: + port: ${APP_PORT:8084} + shutdown: graceful + +spring: + application: + name: springboot-jar17 + lifecycle: + timeout-per-shutdown-phase: 20s + +app: + name: springboot-jar17 + +# 健康检查只需要端口探测,actuator 只暴露 health +management: + endpoints: + web: + exposure: + include: health + endpoint: + health: + show-details: never + +logging: + level: + root: INFO diff --git a/demo/springboot-jar17/src/main/resources/templates/index.html b/demo/springboot-jar17/src/main/resources/templates/index.html new file mode 100644 index 0000000..5587d4b --- /dev/null +++ b/demo/springboot-jar17/src/main/resources/templates/index.html @@ -0,0 +1,27 @@ + + + + + springboot-jar17 运行信息 + + + +

springboot-jar17 运行信息

+ + + + + +
keyvalue
+

+ 其他接口:/api/info、/api/hello/{name}、/actuator/health +

+ + diff --git a/demo/springboot-jar17/startup.sh b/demo/springboot-jar17/startup.sh new file mode 100755 index 0000000..cd50c07 --- /dev/null +++ b/demo/springboot-jar17/startup.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +set -euo pipefail +cd "$(dirname "$0")" +docker-compose -f docker-compose.yml -p springboot-jar17-demo up -d diff --git a/image/runtime-tomcat10/.dockerignore b/image/runtime-tomcat10/.dockerignore new file mode 100644 index 0000000..d3f5903 --- /dev/null +++ b/image/runtime-tomcat10/.dockerignore @@ -0,0 +1,5 @@ +# 由 build.sh 预下载的 Tomcat 压缩包经 ADD 解压进镜像, +# ADD 的源文件必须在构建上下文内,因此 *.tar.gz 不能在这里忽略 +build.sh +.git/ +.DS_Store diff --git a/image/runtime-tomcat10/.gitignore b/image/runtime-tomcat10/.gitignore new file mode 100644 index 0000000..901b252 --- /dev/null +++ b/image/runtime-tomcat10/.gitignore @@ -0,0 +1,4 @@ +# 构建产物 / 本地缓存 +*.tar.gz +*.sha512 +.DS_Store diff --git a/image/runtime-tomcat10/Dockerfile b/image/runtime-tomcat10/Dockerfile new file mode 100644 index 0000000..ce94696 --- /dev/null +++ b/image/runtime-tomcat10/Dockerfile @@ -0,0 +1,22 @@ +FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-jdk17 +LABEL MAINTAINER="tianjun@odboy.cn" +ENV TimeZone=Asia/Shanghai +ENV CATALINA_HOME=/usr/local/tomcat +ENV CATALINA_BASE=/usr/local/tomcat +ENV PATH="${CATALINA_HOME}/bin:$PATH" +WORKDIR /home/admin +# https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.34/bin/apache-tomcat-10.1.34.tar.gz +# 由 build.sh 预先下载并校验 sha512 到本目录,ADD 直接解包得到 apache-tomcat-10.1.34/ +ADD apache-tomcat-10.1.34.tar.gz /usr/local/ +# curl 用于健康检查;nc 用于排障时探测端口 +RUN set -e && yum install \ + curl \ + nmap-ncat \ + sysstat -y; \ + mv /usr/local/apache-tomcat-10.1.34 ${CATALINA_HOME}; \ + rm -rf ${CATALINA_HOME}/webapps/*; \ + chmod +x ${CATALINA_HOME}/bin/*.sh; \ + catalina.sh version; +EXPOSE 8080 +# exec 形式:catalina.sh run 前台运行,docker stop 的 SIGTERM 可触发 Tomcat 优雅停机 +ENTRYPOINT ["catalina.sh", "run"] diff --git a/image/runtime-tomcat10/build.sh b/image/runtime-tomcat10/build.sh new file mode 100755 index 0000000..d99f91a --- /dev/null +++ b/image/runtime-tomcat10/build.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# 先下载 Tomcat 10.1.34 到当前目录并校验官方 sha512,再基于本地文件构建镜像 +# 官方包直接 ADD 解压,不解包重打:镜像内部与 Tomcat 发行版完全一致,便于对照文档排障 +set -euo pipefail +cd "$(dirname "$0")" + +VERSION=10.1.34 +PKG=apache-tomcat-${VERSION}.tar.gz +URL=https://archive.apache.org/dist/tomcat/tomcat-10/v${VERSION}/bin/${PKG} + +if [ ! -f "${PKG}" ]; then + curl -fL -o "${PKG}" "${URL}" + curl -fL -o "${PKG}.sha512" "${URL}.sha512" + # 校验官方 sha512,下载损坏或中间人改写时直接失败(sha512 文件格式: *<文件名>) + echo "$(awk '{print $1}' "${PKG}.sha512") ${PKG}" | shasum -a 512 -c - + rm -f "${PKG}.sha512" +fi + +IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-tomcat10 +docker build -t "${IMAGE}" . +docker push "${IMAGE}"