Skip to content

Commit eac289a

Browse files
authored
Merge pull request #13 from docusign/cicd
fix(docker-build): Resolve issue with .NET version and npm ci
2 parents 43c0bf2 + 6fcb198 commit eac289a

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

DocuSign.Workspaces/DocuSign.Workspaces/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-bullseye-slim AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-bookworm-slim AS base
44

55
WORKDIR /app
66
EXPOSE 80
@@ -14,7 +14,7 @@ RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesourc
1414
RUN apt-get update && apt-get install nodejs -y
1515
RUN npm install -g @angular/cli && npm update
1616

17-
FROM mcr.microsoft.com/dotnet/sdk:8.0-bullseye-slim AS build
17+
FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
1818

1919
WORKDIR /src
2020
COPY ["DocuSign.Workspaces/*.sln", "DocuSign.Workspaces/"]

DocuSign.Workspaces/DocuSign.Workspaces/DocuSign.Workspaces.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">
7070
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
71-
<Exec WorkingDirectory="$(SpaRoot)" Command="npm install --omit=dev" />
71+
<Exec WorkingDirectory="$(SpaRoot)" Command="npm ci --legacy-peer-deps" />
7272
<Exec WorkingDirectory="$(SpaRoot)" Command="npm run build" />
7373

7474
<!-- Include the newly-built files in the publish output -->

0 commit comments

Comments
 (0)