mirror of
https://gitee.com/LongbowEnterprise/BootstrapBlazor.git
synced 2024-11-29 18:49:08 +08:00
chore(Docker): update docker auto script (#4327)
* doc: 更新文档 * style: 调整 H3 下边距 * chore: 更新字典 * doc: 更新配置文件 * chore: 更新 PR 模板 * chore: 更新 Docker 镜像脚本
This commit is contained in:
parent
752796712f
commit
96aef4df16
45
.github/PULL_REQUEST_TEMPLATE/servicing.md
vendored
45
.github/PULL_REQUEST_TEMPLATE/servicing.md
vendored
@ -1,45 +0,0 @@
|
||||
# {PR title}
|
||||
|
||||
Summary of the changes (Less than 80 chars)
|
||||
|
||||
## Description
|
||||
|
||||
{Detail}
|
||||
|
||||
Fixes #{bug number} (in this specific format)
|
||||
|
||||
## Customer Impact
|
||||
|
||||
{Justification}
|
||||
|
||||
## Regression?
|
||||
|
||||
- [ ] Yes
|
||||
- [ ] No
|
||||
|
||||
[If yes, specify the version the behavior has regressed from]
|
||||
|
||||
## Risk
|
||||
|
||||
- [ ] High
|
||||
- [ ] Medium
|
||||
- [ ] Low
|
||||
|
||||
[Justify the selection above]
|
||||
|
||||
## Verification
|
||||
|
||||
- [ ] Manual (required)
|
||||
- [ ] Automated
|
||||
|
||||
## Packaging changes reviewed?
|
||||
|
||||
- [ ] Yes
|
||||
- [ ] No
|
||||
- [ ] N/A
|
||||
|
||||
----
|
||||
|
||||
## When servicing release/2.1
|
||||
|
||||
- [ ] Make necessary changes in eng/PatchConfig.props
|
49
.github/pull_request_template.md
vendored
49
.github/pull_request_template.md
vendored
@ -1,14 +1,47 @@
|
||||
## {PR title}
|
||||
# {PR title}
|
||||
|
||||
<!-- Thank you for submitting a pull request to our repo. -->
|
||||
Summary of the changes (Less than 80 chars)
|
||||
|
||||
<!-- If this is your first PR in the ASP.NET Core repo, please run through the checklist
|
||||
below to ensure a smooth review and merge process for your PR. -->
|
||||
简单描述你更改了什么, 不超过80个字符;如果有关联 Issue 请在下方填写相关编号
|
||||
|
||||
<!-- Once all that is done, you're ready to go. Open the PR with the content below. -->
|
||||
## Description
|
||||
|
||||
<!-- Summary of the changes (Less than 80 chars) -->
|
||||
{Detail}
|
||||
|
||||
### Description
|
||||
Fixes #{bug number} (in this specific format)
|
||||
|
||||
close #{bug number}
|
||||
## Regression?
|
||||
|
||||
- [ ] Yes
|
||||
- [ ] No
|
||||
|
||||
[If yes, specify the version the behavior has regressed from]
|
||||
|
||||
[是否影响老版本]
|
||||
|
||||
## Risk
|
||||
|
||||
- [ ] High
|
||||
- [ ] Medium
|
||||
- [ ] Low
|
||||
|
||||
[Justify the selection above]
|
||||
|
||||
## Verification
|
||||
|
||||
- [ ] Manual (required)
|
||||
- [ ] Automated
|
||||
|
||||
## Packaging changes reviewed?
|
||||
|
||||
- [ ] Yes
|
||||
- [ ] No
|
||||
- [ ] N/A
|
||||
|
||||
## ☑️ Self Check before Merge
|
||||
|
||||
⚠️ Please check all items below before review. ⚠️
|
||||
|
||||
- [ ] Doc is updated/provided or not needed
|
||||
- [ ] Demo is updated/provided or not needed
|
||||
- [ ] Merge the latest code from the main branch
|
||||
|
25
.github/workflows/deploy.yml
vendored
25
.github/workflows/deploy.yml
vendored
@ -1,25 +0,0 @@
|
||||
name: Deploy to Huawei VM
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master-off
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Sync Huawei Clound VM
|
||||
uses: appleboy/ssh-action@master
|
||||
env:
|
||||
BRANCH_NAME: ${{ env.GITHUB_REF }}
|
||||
with:
|
||||
host: ${{ secrets.SSH_HOST }}
|
||||
username: ${{ secrets.SSH_USERNAME }}
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
port: 22
|
||||
script: |
|
||||
cd ~/BootstrapBlazor
|
||||
git checkout dev
|
||||
sh ~/deploy-blazor.sh
|
6
.github/workflows/docker.yml
vendored
6
.github/workflows/docker.yml
vendored
@ -3,7 +3,7 @@ name: Build docker image
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- dev-dockerfile
|
||||
- pack
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
@ -12,13 +12,13 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Login to Docker Hub
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build and push Docker images
|
||||
uses: docker/build-push-action@v2.7.0
|
||||
uses: docker/build-push-action@v6
|
||||
with:
|
||||
file: src/BootstrapBlazor.Server/Dockerfile
|
||||
push: true
|
||||
|
104
.github/workflows/release.yml
vendored
104
.github/workflows/release.yml
vendored
@ -1,104 +0,0 @@
|
||||
name: Package extensions to Nuget
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- release
|
||||
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup .NET Core SDK
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: 8.0.x
|
||||
|
||||
- name: Publish to Nuget
|
||||
env:
|
||||
NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
|
||||
Bundle: True
|
||||
run: |
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.AzureOpenAI -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.AzureOpenAI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.AzureSpeech -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.AzureSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduOcr -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.BaiduOcr.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.BaiduSpeech -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.BaiduSpeech.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.BarCode -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.BarCode.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Chart -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Chart.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.CherryMarkdown -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.CherryMarkdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.CodeEditor -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.CodeEditor.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Dock -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Dock.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.FloatingUI -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.FloatingUI.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.FontAwesome -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.FontAwesome.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Gantt -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Gantt.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Html2Pdf -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Html2Pdf.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Live2DDisplay -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Live2DDisplay.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Markdown -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Markdown.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.MaterialDesign.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.MaterialDesign.Extensions -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.MaterialDesign.Extensions.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.MouseFollower -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.MouseFollower.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Splitting -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Splitting.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.SummerNote -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.SummerNote.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.TableExport -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.TableExport.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/Components/BootstrapBlazor.Topology -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Topology.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.PetaPoco -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.DataAccess.PetaPoco.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.EntityFrameworkCore -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.DataAccess.EntityFrameworkCore.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/DataServices/BootstrapBlazor.DataAccess.FreeSql -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.DataAccess.FreeSql.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Extensions/BootstrapBlazor.TagHelper -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.TagHelper.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
||||
|
||||
dotnet pack src/Middleware/BootstrapBlazor.Middleware -c Release -o publish
|
||||
dotnet nuget push publish/BootstrapBlazor.Middleware.*.nupkg -s https://api.nuget.org/v3/index.json -k $NUGET_API_KEY --skip-duplicate
|
@ -73,6 +73,7 @@ layui
|
||||
devui
|
||||
appsettings
|
||||
cshtml
|
||||
csharp
|
||||
Starup
|
||||
args
|
||||
nameof
|
||||
|
@ -3,9 +3,7 @@
|
||||
|
||||
<h3>@Localizer["Title"]</h3>
|
||||
|
||||
<div>重构中 ... 稍后开放</div>
|
||||
|
||||
@* <PackageTips Name="BootstrapBlazor.CodeEditor"></PackageTips>
|
||||
<PackageTips Name="BootstrapBlazor.CodeEditor"></PackageTips>
|
||||
|
||||
<DemoBlock Title="@Localizer["BasicTitle"]" Introduction="@Localizer["BasicIntro"]">
|
||||
<div class="row form-inline g-3">
|
||||
@ -37,4 +35,4 @@
|
||||
</div>
|
||||
</DemoBlock>
|
||||
|
||||
<AttributeTable Items="GetAttributeItems()" /> *@
|
||||
<AttributeTable Items="GetAttributeItems()" />
|
||||
|
@ -1,11 +1,11 @@
|
||||
#Depending on the operating system of the host machines(s) that will build or run the containers, the image specified in the FROM statement may need to be changed.
|
||||
#For more information, please see https://aka.ms/containercompat
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 80
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||
WORKDIR /
|
||||
COPY . .
|
||||
|
||||
|
@ -128,7 +128,6 @@
|
||||
"qr-code": "QRCodes",
|
||||
"query-builder": "QueryBuilders",
|
||||
"web-serial": "WebSerials",
|
||||
"web-speech": "WebSpeechs",
|
||||
"radio": "Radios",
|
||||
"rate": "Rates",
|
||||
"reconnector": "Reconnectors",
|
||||
|
@ -46,7 +46,7 @@
|
||||
--bs-navbar-hover-color: rgb(255,255,255);
|
||||
}
|
||||
|
||||
h4, h5 {
|
||||
h3, h4, h5 {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user