refactor: 目录重组,runtime-python3→runtime-python310、tools-ansible→app/ansible、dotnet6 示例→demo/dotnet6,并同步 README
This commit is contained in:
@@ -1,4 +0,0 @@
|
||||
bin/
|
||||
obj/
|
||||
.git/
|
||||
.DS_Store
|
||||
@@ -1,2 +0,0 @@
|
||||
bin/
|
||||
obj/
|
||||
@@ -1,11 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<InvariantGlobalization>true</InvariantGlobalization>
|
||||
<RootNamespace>Demo</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,18 +0,0 @@
|
||||
# 编译阶段:使用编译环境镜像 compile-dotnet6(含 SDK 6.0.427)
|
||||
FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet6 AS build
|
||||
WORKDIR /src
|
||||
COPY Demo.csproj ./
|
||||
RUN dotnet restore Demo.csproj
|
||||
COPY . ./
|
||||
RUN dotnet publish Demo.csproj -c Release -o /app/publish --no-restore
|
||||
|
||||
# 运行阶段:使用运行环境镜像 runtime-dotnet6(仅含 ASP.NET Core 运行时 6.0.35)
|
||||
FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet6 AS runtime
|
||||
LABEL MAINTAINER="tianjun@odboy.cn"
|
||||
ENV TimeZone=Asia/Shanghai
|
||||
ENV ASPNETCORE_URLS=http://0.0.0.0:8080
|
||||
ENV DOTNET_RUNNING_IN_CONTAINER=true
|
||||
WORKDIR /home/admin
|
||||
COPY --from=build /app/publish ./
|
||||
EXPOSE 8080
|
||||
ENTRYPOINT ["dotnet", "Demo.dll"]
|
||||
@@ -1,18 +0,0 @@
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
// 容器内监听 8080,避免与宿主机其它 80 端口冲突;可用环境变量 ASPNETCORE_URLS 覆盖
|
||||
builder.WebHost.UseUrls(Environment.GetEnvironmentVariable("ASPNETCORE_URLS") ?? "http://0.0.0.0:8080");
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
app.MapGet("/", () => Results.Json(new
|
||||
{
|
||||
message = "dotnet6 is running",
|
||||
runtime = Environment.Version.ToString(),
|
||||
os = System.Runtime.InteropServices.RuntimeInformation.OSDescription,
|
||||
time = DateTimeOffset.Now.ToString("yyyy-MM-dd HH:mm:ss zzz")
|
||||
}));
|
||||
|
||||
app.MapGet("/health", () => Results.Ok("ok"));
|
||||
|
||||
app.Run();
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# 在示例目录下构建示例镜像(编译 + 运行两阶段均在本机 docker 内完成)
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
IMAGE=${IMAGE:-registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-dotnet6}
|
||||
docker build -t "${IMAGE}" .
|
||||
|
||||
if [ "${PUSH:-0}" = "1" ]; then
|
||||
docker push "${IMAGE}"
|
||||
fi
|
||||
@@ -1,28 +0,0 @@
|
||||
version: '3.8'
|
||||
|
||||
networks:
|
||||
dotnet6-demo:
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: "172.26.0.0/24"
|
||||
|
||||
services:
|
||||
demo:
|
||||
image: registry.cn-shanghai.aliyuncs.com/odboy/kenaito:demo-dotnet6 # 镜像由 build.sh 构建
|
||||
container_name: dotnet6-demo
|
||||
restart: unless-stopped
|
||||
ports: # 映射端口
|
||||
- "8080:8080"
|
||||
environment: # 设置环境变量,相当于docker run命令中的-e
|
||||
TZ: Asia/Shanghai
|
||||
ASPNETCORE_URLS: http://0.0.0.0:8080
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "netstat -tln | grep -q ':8080 '"]
|
||||
interval: 30s
|
||||
timeout: 5s
|
||||
retries: 3
|
||||
start_period: 5s
|
||||
networks:
|
||||
dotnet6-demo:
|
||||
ipv4_address: 172.26.0.20
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
docker-compose -f docker-compose.yml -p dotnet6-demo up -d
|
||||
@@ -1,78 +0,0 @@
|
||||
# dotnet6 编译 + 运行示例
|
||||
|
||||
演示如何用本目录的两个镜像构建一个 .NET 6 Web 应用:
|
||||
|
||||
| 阶段 | 镜像 | 说明 |
|
||||
|----|-------------------------------------------------------------|-----------------------------|
|
||||
| 编译 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet6` | 含 SDK 6.0.427(见上级 `Dockerfile`) |
|
||||
| 运行 | `registry.cn-shanghai.aliyuncs.com/odboy/kenaito:runtime-dotnet6` | 仅含 ASP.NET Core 运行时 6.0.35(见 `image/runtime-dotnet6`) |
|
||||
|
||||
编译环境镜像带 SDK 和整套编译工具链(体积大),只在构建阶段使用;运行阶段只拷贝 `dotnet publish` 的产物,
|
||||
镜像里不带 SDK、源码和中间文件。
|
||||
|
||||
### 示例内容
|
||||
|
||||
```
|
||||
demo/
|
||||
├── Demo.csproj # net6.0 Web 项目
|
||||
├── Program.cs # 最小 Web API:GET / 返回运行时信息,GET /health 健康检查
|
||||
├── Dockerfile # 两阶段构建:compile-dotnet6 -> runtime-dotnet6
|
||||
├── build.sh # 构建镜像(PUSH=1 时同时推送)
|
||||
├── docker-compose.yml # 部署编排(端口 8080,固定 IP 172.26.0.20)
|
||||
├── install.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-dotnet6 .
|
||||
PUSH=1 sh build.sh # 构建并推送
|
||||
sh install.sh # docker-compose -f docker-compose.yml -p dotnet6-demo up -d
|
||||
```
|
||||
|
||||
访问:
|
||||
|
||||
```shell
|
||||
curl http://192.168.235.104:8080/ # {"message":"dotnet6 is running","runtime":"6.0.35",...}
|
||||
curl http://192.168.235.104:8080/health # ok
|
||||
```
|
||||
|
||||
### 关键点
|
||||
|
||||
**还原与发布分离**:先 `COPY` 只有 `*.csproj` 的一层执行 `dotnet restore`,再 `COPY` 源码 `dotnet publish --no-restore`。
|
||||
源码改动不会让还原缓存失效,重复构建更快。多项目解决方案可按需增加 `COPY` 的 `*.sln` / `*.csproj` 文件。
|
||||
|
||||
**监听地址**:容器内监听 `8080`(`ASPNETCORE_URLS=http://0.0.0.0:8080`),不占用 80 端口,方便与宿主机其它服务共存。
|
||||
镜像环境变量、compose 环境变量、部署时 `-e` 三者依次覆盖。
|
||||
|
||||
**时区**:镜像已内置 `TimeZone=Asia/Shanghai`,`DateTimeOffset.Now` 输出 +08:00;compose 中再用 `TZ` 显式声明一次。
|
||||
|
||||
**入口**:`ENTRYPOINT ["dotnet", "Demo.dll"]`,使用 exec 形式保证 `docker stop` 的 SIGTERM 能传到进程,优雅退出。
|
||||
|
||||
**健康检查**:运行镜像自带 `netstat`(`net-tools`),直接用端口探测,不需要额外安装 curl。
|
||||
|
||||
### 运维命令
|
||||
|
||||
```shell
|
||||
docker logs -f dotnet6-demo # 应用日志(stdout/stderr)
|
||||
docker exec dotnet6-demo dotnet --info # 确认运行时版本
|
||||
docker exec dotnet6-demo sh -c 'ls /home/admin'
|
||||
```
|
||||
|
||||
### 调试时直接在编译镜像里运行
|
||||
|
||||
需要看编译报错或临时跑一下时,可以只挂载源码进编译镜像(不需要构建镜像):
|
||||
|
||||
```shell
|
||||
docker run --rm -it -p 8080:8080 \
|
||||
-v "$PWD":/src -w /src \
|
||||
registry.cn-shanghai.aliyuncs.com/odboy/kenaito:compile-dotnet6 \
|
||||
dotnet run
|
||||
```
|
||||
|
||||
### 停止
|
||||
|
||||
```shell
|
||||
sh shutdown.sh
|
||||
```
|
||||
@@ -1,4 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
docker-compose -f docker-compose.yml -p dotnet6-demo down
|
||||
@@ -15,20 +15,16 @@ RUN set -e && yum install \
|
||||
ncurses-devel \
|
||||
sqlite-devel \
|
||||
readline-devel \
|
||||
tk-devel \
|
||||
gdbm-devel \
|
||||
libpcap-devel \
|
||||
xz-devel \
|
||||
make \
|
||||
patch \
|
||||
gcc \
|
||||
tar \
|
||||
sysstat \
|
||||
net-tools -y; \
|
||||
tar -xvf Python-3.10.0.tgz; \
|
||||
cd Python-3.10.0; \
|
||||
./configure --prefix=/usr/local/python3; \
|
||||
make && make install; \
|
||||
python3 -V; \
|
||||
cd /home/admin && rm -rf Python-3.10.0; \
|
||||
mkdir ~/.pip;
|
||||
COPY pip.conf ~/.pip/
|
||||
@@ -1,5 +0,0 @@
|
||||
# 由 build.sh 预下载的 Python 源码包经 ADD 解压进镜像,
|
||||
# ADD 的源文件必须在构建上下文内,因此 *.tgz 不能在这里忽略
|
||||
build.sh
|
||||
.git/
|
||||
.DS_Store
|
||||
@@ -1,3 +0,0 @@
|
||||
# 构建产物 / 本地缓存
|
||||
*.tgz
|
||||
.DS_Store
|
||||
@@ -1,37 +0,0 @@
|
||||
FROM registry.cn-shanghai.aliyuncs.com/odboy/kenaito:system-alinux3
|
||||
LABEL MAINTAINER="tianjun@odboy.cn"
|
||||
ENV TimeZone=Asia/Shanghai
|
||||
ENV PYTHON_HOME=/usr/local/python3
|
||||
ENV PATH="${PYTHON_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz
|
||||
# 由 build.sh 预先下载到本目录
|
||||
ADD Python-3.10.0.tgz ./
|
||||
RUN set -e && yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
openssl-devel \
|
||||
ncurses-devel \
|
||||
sqlite-devel \
|
||||
readline-devel \
|
||||
tk-devel \
|
||||
gdbm-devel \
|
||||
libpcap-devel \
|
||||
xz-devel \
|
||||
make \
|
||||
patch \
|
||||
gcc \
|
||||
tar \
|
||||
sysstat \
|
||||
net-tools -y; \
|
||||
tar -xvf Python-3.10.0.tgz; \
|
||||
cd Python-3.10.0; \
|
||||
./configure --prefix=/usr/local/python3; \
|
||||
make && make install; \
|
||||
python3 -V; \
|
||||
mkdir ~/.pip;
|
||||
COPY pip.conf ~/.pip/
|
||||
RUN set -e && yum install -y \
|
||||
epel-release \
|
||||
ansible;
|
||||
@@ -1,15 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# 先下载 Python 源码包到当前目录,再基于本地文件构建镜像
|
||||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
PYTHON=Python-3.10.0.tgz
|
||||
URL=https://www.python.org/ftp/python/3.10.0/${PYTHON}
|
||||
|
||||
if [ ! -f "${PYTHON}" ]; then
|
||||
curl -fL -o "${PYTHON}" "${URL}"
|
||||
fi
|
||||
|
||||
IMAGE=registry.cn-shanghai.aliyuncs.com/odboy/kenaito:tools-ansible
|
||||
docker build -t "${IMAGE}" .
|
||||
docker push "${IMAGE}"
|
||||
@@ -1,5 +0,0 @@
|
||||
[global]
|
||||
index-url = https://mirrors.aliyun.com/pypi/simple
|
||||
|
||||
[install]
|
||||
trusted-host = mirrors.aliyun.com
|
||||
Reference in New Issue
Block a user