From 7262a4ab6eeff69c9e897fa5a66fd1f71c8583db Mon Sep 17 00:00:00 2001 From: qxa Date: Fri, 29 Mar 2024 15:54:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/push-master.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitea/workflows/push-master.yaml b/.gitea/workflows/push-master.yaml index 6858486..262ef39 100644 --- a/.gitea/workflows/push-master.yaml +++ b/.gitea/workflows/push-master.yaml @@ -30,8 +30,6 @@ jobs: name: 编译发布 runs-on: linux needs: release - env: - version: ${{ needs.release.outputs.version }} container: image: node:16-bullseye volumes: -- 2.40.1 From f2447f77b4ed4bdcbfe845c4b1e643394e2e456f Mon Sep 17 00:00:00 2001 From: qxa Date: Fri, 29 Mar 2024 16:01:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/release-version.yaml | 18 +++++++++--------- Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile | 3 --- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/release-version.yaml b/.gitea/workflows/release-version.yaml index 7378165..56e73c0 100644 --- a/.gitea/workflows/release-version.yaml +++ b/.gitea/workflows/release-version.yaml @@ -31,15 +31,15 @@ jobs: with: project_name: ${{ env.PROJECT_NAME }} - - name: 打包上传镜像 - uses: actions/docker@master - with: - registry: ${{ secrets.DOCKER_REGISTRY }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - image: ${{ env.IMAGE_NAME }} - context: publish - tags: latest,${{ gitea.ref_name }} + # - name: 打包上传镜像 + # uses: actions/docker@master + # with: + # registry: ${{ secrets.DOCKER_REGISTRY }} + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} + # image: ${{ env.IMAGE_NAME }} + # context: publish + # tags: latest,${{ gitea.ref_name }} - name: 打包压缩 run: | diff --git a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile index 4f19583..7e9c175 100644 --- a/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile +++ b/Dolphin.ExamPictureCut.HttpApi.Host/Dockerfile @@ -1,8 +1,5 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 -ARG ASPNETCORE_ENVIRONMENT -ENV ASPNETCORE_ENVIRONMENT ${ASPNETCORE_ENVIRONMENT} - ENV TZ=Asia/Shanghai \ DEBIAN_FRONTEND=noninteractive -- 2.40.1 From b07c778d78e35e225b441fe692df8ec4fa18b7f3 Mon Sep 17 00:00:00 2001 From: qxa Date: Fri, 29 Mar 2024 16:14:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=BAwin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/push-master.yaml | 1 + .gitea/workflows/release-version.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitea/workflows/push-master.yaml b/.gitea/workflows/push-master.yaml index 262ef39..93595ac 100644 --- a/.gitea/workflows/push-master.yaml +++ b/.gitea/workflows/push-master.yaml @@ -49,6 +49,7 @@ jobs: uses: actions/aspnet@8.0 with: project_name: ${{ env.PROJECT_NAME }} + os: win - name: 打包压缩 run: | diff --git a/.gitea/workflows/release-version.yaml b/.gitea/workflows/release-version.yaml index 56e73c0..64db7bc 100644 --- a/.gitea/workflows/release-version.yaml +++ b/.gitea/workflows/release-version.yaml @@ -30,6 +30,7 @@ jobs: uses: actions/aspnet@8.0 with: project_name: ${{ env.PROJECT_NAME }} + os: win # - name: 打包上传镜像 # uses: actions/docker@master -- 2.40.1