SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix Dockerfiles to apply custom Nuget.Config

Browse source
This commit is contained in:
Sipke Schoorstra 2021-11-22 22:03:44 +01:00
parent a0b3ca00f1
commit 0df2269df5
6 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.dockerignore
View file

@ -4,7 +4,7 @@
.gitignore
.vs
.vscode
*/bin
*/obj
**/bin
**/obj
**/.toolstarget
**/node_modules

2
Elsa.sln
View file

@ -242,6 +242,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker", "docker", "{D7F754
docker\Dockerfile-elsa-dashboard = docker\Dockerfile-elsa-dashboard
docker\Dockerfile-elsa-dashboard-and-server = docker\Dockerfile-elsa-dashboard-and-server
docker\README.md = docker\README.md
docker\Dockerfile-elsa-server = docker\Dockerfile-elsa-server
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elsa.Persistence.EntityFramework.MySql", "src\persistence\Elsa.Persistence.EntityFramework\Elsa.Persistence.EntityFramework.MySql\Elsa.Persistence.EntityFramework.MySql.csproj", "{D55BC08B-CA82-478A-99F7-EDE90AC33160}"
@ -373,6 +374,7 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.WorkflowTesting", "src\modules\Elsa.WorkflowTesting\Elsa.WorkflowTesting.csproj", "{0327324E-0B80-4A6A-A7D6-DD521657666F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.WorkflowTesting.Api", "src\modules\Elsa.WorkflowTesting.Api\Elsa.WorkflowTesting.Api.csproj", "{4A4DC44E-D50F-49B8-A9DE-DED26FC05166}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elsa.Samples.UniqueCorrelatedWorkflows", "src\samples\aspnet\Elsa.Samples.UniqueCorrelatedWorkflows\Elsa.Samples.UniqueCorrelatedWorkflows.csproj", "{4CD8293D-4544-4A23-BDEF-15B66D5E924F}"
EndProject
Global

4
docker/Dockerfile
View file

@ -4,13 +4,13 @@ FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim-amd64 AS build
WORKDIR /source
# restore packages
COPY ./Nuget.Config ./
COPY ./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj ./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj
RUN dotnet restore "./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj"
RUN dotnet restore "./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj" --configfile ./Nuget.Config
# copy required source code
COPY src/. ./src
COPY *.props ./
COPY ./Nuget.Config ./
# build and publish (UseAppHost=false created platform independent binaries)
WORKDIR /source/src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith

4
docker/Dockerfile-elsa-dashboard
View file

@ -2,6 +2,7 @@ FROM node:15-alpine as client-build
WORKDIR /app
COPY /src .
COPY ./Nuget.Config ./
WORKDIR /app/designer/elsa-workflows-studio
RUN npm install --force
@ -16,12 +17,11 @@ WORKDIR /source
# restore packages
COPY ./src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj ./src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj
RUN dotnet restore "./src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj"
RUN dotnet restore "./src/dashboards/ElsaDashboard/ElsaDashboard.Web.csproj" --configfile ./Nuget.Config
# copy required source code
COPY src/. ./src
COPY *.props ./
COPY ./Nuget.Config ./
COPY --from=client-build /app/designer/bindings/aspnet/Elsa.Designer.Components.Web ./src/designer/bindings/aspnet/Elsa.Designer.Components.Web
# build and publish (UseAppHost=false created platform independent binaries)

4
docker/Dockerfile-elsa-dashboard-and-server
View file

@ -2,6 +2,7 @@ FROM node:15-alpine as client-build
WORKDIR /app
COPY /src .
COPY ./Nuget.Config ./
WORKDIR /app/designer/elsa-workflows-studio
RUN npm install --force
@ -16,12 +17,11 @@ WORKDIR /source
# restore packages
COPY ./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj ./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj
RUN dotnet restore "./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj"
RUN dotnet restore "./src/samples/dashboard/aspnetcore/ElsaDashboard.Samples.AspNetCore.Monolith/ElsaDashboard.Samples.AspNetCore.Monolith.csproj" --configfile ./Nuget.Config
# copy required source code
COPY src/. ./src
COPY *.props ./
COPY ./Nuget.Config ./
COPY --from=client-build /app/designer/bindings/aspnet/Elsa.Designer.Components.Web ./src/designer/bindings/aspnet/Elsa.Designer.Components.Web
# build and publish (UseAppHost=false creates platform independent binaries)

12
docker/Dockerfile-elsa-server
View file

@ -1,19 +1,13 @@
FROM node:15-alpine as client-build
WORKDIR /app
COPY /src .
FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim-amd64 AS build
WORKDIR /source
# restore packages
COPY ./src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj ./src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj
RUN dotnet restore "./src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj"
# copy required source code
COPY src/. ./src
COPY *.props ./
COPY ./Nuget.Config ./
COPY ./src/. ./src
COPY *.props ./
RUN dotnet restore "./src/samples/server/Elsa.Samples.Server.Host/Elsa.Samples.Server.Host.csproj" --configfile ./Nuget.Config
# build and publish (UseAppHost=false creates platform independent binaries)
WORKDIR /source/src/samples/server/Elsa.Samples.Server.Host