feat: 调整dockerfile

3 years ago · 363ec47b7f
18 changed files with 12246 additions and 8254 deletions
--- a/aspnet-core/.dockerignore
+++ b/aspnet-core/.dockerignore
@ -0,0 +1,3 @@
+**/bin
+**/obj
+**/logs
--- a/aspnet-core/Dockerfile
+++ b/aspnet-core/Dockerfile
@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+ENV TZ=Asia/Shanghai
+ENV ASPNETCORE_ENVIRONMENT=Production
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/services/host/Lion.AbpPro.HttpApi.Host"
+RUN dotnet build "Lion.AbpPro.HttpApi.Host.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "Lion.AbpPro.HttpApi.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .    
+ENTRYPOINT ["dotnet", "Lion.AbpPro.HttpApi.Host.dll"]
+
--- a/aspnet-core/Lion.AbpPro.sln
+++ b/aspnet-core/Lion.AbpPro.sln
@ -42,6 +42,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.Solution Items", "0.Solut
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Build.Volo.targets = Directory.Build.Volo.targets
 		..\Readme.md = ..\Readme.md
+		Dockerfile = Dockerfile
+		.dockerignore = .dockerignore
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{F8A8EB2A-2D4B-464F-9A13-F8F7B6A8FAA3}"
--- a/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Dockerfile
+++ b/aspnet-core/modules/BasicManagement/host/Lion.AbpPro.BasicManagement.HttpApi.Host/Dockerfile
@ -1,18 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
-WORKDIR /src
-COPY . .
-WORKDIR /src/templates/service/host/Lion.AbpPro.BasicManagement.HttpApi.Host
-RUN dotnet restore -nowarn:msb3202,nu1503
-RUN dotnet build --no-restore -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "Lion.AbpPro.BasicManagement.HttpApi.Host.dll"]
--- a/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Dockerfile
+++ b/aspnet-core/modules/DataDictionaryManagement/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host/Dockerfile
@ -1,18 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
-WORKDIR /src
-COPY . .
-WORKDIR /src/templates/service/host/Lion.AbpPro.DataDictionaryManagement.HttpApi.Host
-RUN dotnet restore -nowarn:msb3202,nu1503
-RUN dotnet build --no-restore -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "Lion.AbpPro.DataDictionaryManagement.HttpApi.Host.dll"]
--- a/aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Dockerfile
+++ b/aspnet-core/modules/LanguageManagement/host/Lion.AbpPro.LanguageManagement.HttpApi.Host/Dockerfile
@ -1,18 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
-WORKDIR /src
-COPY . .
-WORKDIR /src/templates/service/host/Lion.AbpPro.LanguageManagement.HttpApi.Host
-RUN dotnet restore -nowarn:msb3202,nu1503
-RUN dotnet build --no-restore -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "Lion.AbpPro.LanguageManagement.HttpApi.Host.dll"]
--- a/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
+++ b/aspnet-core/modules/NotificationManagement/host/Lion.AbpPro.NotificationManagement.HttpApi.Host/Lion.AbpPro.NotificationManagement.HttpApi.Host.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">


-
    <PropertyGroup>
        <TargetFramework>net7.0</TargetFramework>
        <RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
@ -10,39 +9,42 @@
    </PropertyGroup>

    <ItemGroup>
-    <PackageReference Include="Serilog" />
-    <PackageReference Include="Serilog.AspNetCore" />
-    <PackageReference Include="Serilog.Exceptions" />
-    <PackageReference Include="Serilog.Extensions.Logging" />
-    <PackageReference Include="Serilog.Settings.Configuration" />
-    <PackageReference Include="Serilog.Sinks.Console" />
-    <PackageReference Include="Serilog.Sinks.Elasticsearch" />
-    <PackageReference Include="Serilog.Sinks.File" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" />
-    <PackageReference Include="Volo.Abp.Autofac" />
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" />
-    <PackageReference Include="Swashbuckle.AspNetCore" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
+        <PackageReference Include="Serilog"/>
+        <PackageReference Include="Serilog.AspNetCore"/>
+        <PackageReference Include="Serilog.Exceptions"/>
+        <PackageReference Include="Serilog.Extensions.Logging"/>
+        <PackageReference Include="Serilog.Settings.Configuration"/>
+        <PackageReference Include="Serilog.Sinks.Console"/>
+        <PackageReference Include="Serilog.Sinks.Elasticsearch"/>
+        <PackageReference Include="Serilog.Sinks.File"/>
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer"/>
+        <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools"/>
+        <PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL"/>
+        <PackageReference Include="Volo.Abp.Autofac"/>
+        <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.Serilog"/>
+        <PackageReference Include="Volo.Abp.Swashbuckle"/>
+        <PackageReference Include="Swashbuckle.AspNetCore"/>
+        <PackageReference Include="Swashbuckle.AspNetCore.Annotations"/>
    </ItemGroup>

    <ItemGroup>
-    <ProjectReference Include="..\..\..\..\frameworks\src\Lion.AbpPro.CAP\Lion.AbpPro.CAP.csproj" />
-    <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.HttpApi\Lion.AbpPro.NotificationManagement.HttpApi.csproj" />
-    <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.Application\Lion.AbpPro.NotificationManagement.Application.csproj" />
-    <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj" />
+        <ProjectReference Include="..\..\..\..\frameworks\src\Lion.AbpPro.CAP\Lion.AbpPro.CAP.csproj"/>
+        <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.HttpApi\Lion.AbpPro.NotificationManagement.HttpApi.csproj"/>
+        <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.Application\Lion.AbpPro.NotificationManagement.Application.csproj"/>
+        <ProjectReference Include="..\..\src\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj"/>
    </ItemGroup>

    <ItemGroup>
-    <Compile Remove="Logs\**" />
-    <Content Remove="Logs\**" />
-    <EmbeddedResource Remove="Logs\**" />
-    <None Remove="Logs\**" />
+        <Compile Remove="Logs\**"/>
+        <Content Remove="Logs\**"/>
+        <EmbeddedResource Remove="Logs\**"/>
+        <None Remove="Logs\**"/>
    </ItemGroup>
    
+    <ItemGroup>
+        <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json"/>
+    </ItemGroup>
 </Project>
--- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile
+++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/Dockerfile
@ -1,34 +0,0 @@
-FROM mcr.microsoft.com/dotnet/aspnet:7.0
-
-# 创建目录
-RUN mkdir /app
-
-COPY publish /app
-
-RUN echo "deb http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" > /etc/apt/sources.list && \
-    echo "deb-src http://mirrors.aliyun.com/debian/ bullseye main non-free contrib" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \
-    echo "deb-src http://mirrors.aliyun.com/debian-security/ bullseye-security main" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \
-    echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-updates main non-free contrib" >> /etc/apt/sources.list && \
-    echo "deb http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \
-    echo "deb-src http://mirrors.aliyun.com/debian/ bullseye-backports main non-free contrib" >> /etc/apt/sources.list && \
-    apt-get update && \
-    apt-get install libgdiplus libc6-dev -y && \
-    ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll && \
-    ln -s /usr/lib/x86_64-linux-gnu/libdl.so /usr/lib/libdl.dll && apt-get clean
-    
-# 设置工作目录
-WORKDIR /app
-
-# 暴露80端口
-EXPOSE 80
-# 设置时区 .net6 才有这个问题
-ENV TZ=Asia/Shanghai
-
-# 设置环境变量
-ENV ASPNETCORE_ENVIRONMENT=Production
-
-ENTRYPOINT ["dotnet", "Lion.AbpPro.HttpApi.Host.dll"]
-
-
--- a/templates/abp-vnext-pro-nuget-all/aspnet-core/.dockerignore
+++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/.dockerignore
@ -0,0 +1,3 @@
+**/bin
+**/obj
+**/logs
--- a/templates/abp-vnext-pro-nuget-all/aspnet-core/Dockerfile
+++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/Dockerfile
@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+ENV TZ=Asia/Shanghai
+ENV ASPNETCORE_ENVIRONMENT=Production
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/host/MyCompanyName.MyProjectName.HttpApi.Host"
+RUN dotnet build "MyCompanyName.MyProjectName.HttpApi.Host.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "MyCompanyName.MyProjectName.HttpApi.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .    
+ENTRYPOINT ["dotnet", "MyCompanyName.MyProjectName.HttpApi.Host.dll"]
+
--- a/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs
+++ b/templates/abp-vnext-pro-nuget-all/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs
@ -16,7 +16,6 @@ global using Lion.AbpPro;
 global using MyCompanyName.MyProjectName.EntityFrameworkCore;
 global using MyCompanyName.MyProjectName.Extensions;
 global using MyCompanyName.MyProjectName.Extensions.Hangfire;
-global using MyCompanyName.MyProjectName.Extensions.Middlewares;
 global using MyCompanyName.MyProjectName.MultiTenancy;
 global using Microsoft.AspNetCore.Authentication.JwtBearer;
 global using Microsoft.AspNetCore.Builder;
--- a/templates/abp-vnext-pro-nuget-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Dockerfile
+++ b/templates/abp-vnext-pro-nuget-module/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host/Dockerfile
@ -1,18 +0,0 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
-WORKDIR /src
-COPY . .
-WORKDIR /src/templates/service/host/MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host
-RUN dotnet restore -nowarn:msb3202,nu1503
-RUN dotnet build --no-restore -c Release -o /app
-
-FROM build AS publish
-RUN dotnet publish --no-restore -c Release -o /app
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app .
-ENTRYPOINT ["dotnet", "MyCompanyName.MyProjectName.MyModuleName.HttpApi.Host.dll"]
--- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Dockerfile
+++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/Dockerfile
@ -0,0 +1,21 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+ENV TZ=Asia/Shanghai
+ENV ASPNETCORE_ENVIRONMENT=Production
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+WORKDIR /src
+COPY . .
+WORKDIR "/src/host/MyCompanyName.MyProjectName.HttpApi.Host"
+RUN dotnet build "MyCompanyName.MyProjectName.HttpApi.Host.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "MyCompanyName.MyProjectName.HttpApi.Host.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .    
+ENTRYPOINT ["dotnet", "MyCompanyName.MyProjectName.HttpApi.Host.dll"]
+
--- a/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs
+++ b/templates/abp-vnext-pro-nuget-simplify/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/GlobalUsings.cs
@ -16,7 +16,6 @@ global using Lion.AbpPro;
 global using MyCompanyName.MyProjectName.EntityFrameworkCore;
 global using MyCompanyName.MyProjectName.Extensions;
 global using MyCompanyName.MyProjectName.Extensions.Hangfire;
-global using MyCompanyName.MyProjectName.Extensions.Middlewares;
 global using MyCompanyName.MyProjectName.MultiTenancy;
 global using Microsoft.AspNetCore.Authentication.JwtBearer;
 global using Microsoft.AspNetCore.Builder;
--- a/vben28/.dockerignore
+++ b/vben28/.dockerignore
@ -0,0 +1,3 @@
+node_modules/
+dist/
+.vscode/
--- a/vben28/Dockerfile
+++ b/vben28/Dockerfile
@ -1,9 +1,18 @@
-FROM nginx:1.17.3-alpine as base
-EXPOSE 80
+FROM node:16-alpine as build-stage
+WORKDIR /app
+COPY . ./
+ENV NODE_OPTIONS=--max-old-space-size=16384
+RUN npm install pnpm -g 
+RUN pnpm i 
+RUN pnpm build
+

-COPY /_nginx/nginx.conf /etc/nginx/nginx.conf
-COPY /_nginx/env.js /etc/nginx/env.js
-COPY /_nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY /dist/ /usr/share/nginx/html
+FROM nginx:1.17.3-alpine as production-stage
+COPY --from=build-stage app/_nginx/nginx.conf /etc/nginx/nginx.conf
+COPY --from=build-stage app/_nginx/env.js /etc/nginx/env.js
+COPY --from=build-stage app/_nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY --from=build-stage app/dist/ /usr/share/nginx/html
+EXPOSE 80

 CMD ["nginx", "-g", "daemon off;"]
+
--- a/vben28/pnpm-lock.yaml
+++ b/vben28/pnpm-lock.yaml
--- a/vben28/src/views/admin/files/File.vue
+++ b/vben28/src/views/admin/files/File.vue
@ -1,3 +1,6 @@
+<template>
+  <div></div>
+</template>
 <!-- <template>
  <div>
    <BasicTable @register="registerTable" size="small">