Skip to content

Commit

Permalink
Merge Use docfx as global dotnet tool
Browse files Browse the repository at this point in the history
  • Loading branch information
danjov authored Mar 17, 2023
2 parents b59ef0c + fa76f42 commit afce6a6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 4 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ SHELL ["/bin/bash", "-c"]

# Install missing packages
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
RUN apt-get install -y nodejs mono-complete unzip
RUN apt-get install -y nodejs unzip

# Download and unzip latest DocFX release
RUN curl https://github.com/dotnet/docfx/releases/latest/download/docfx.zip -LO --silent --show-error && \
unzip -o -q docfx.zip
# Install latest DocFX release
RUN dotnet tool update -g docfx

# Restore dependencies and tools
COPY src/EWS.csproj .
Expand All @@ -32,7 +31,7 @@ RUN dotnet publish "EWS.csproj" \

# Build documentation
COPY docs/ ./docs/
RUN mono docfx.exe build -o ${PUBLISH_DIR}/wwwroot/help docs/docfx.json
RUN ~/.dotnet/tools/docfx build -o ${PUBLISH_DIR}/wwwroot/help docs/docfx.json

FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS final
ENV HOME=/app
Expand Down
2 changes: 1 addition & 1 deletion src/ClientApp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"prestart": "node aspnetcore-https && node aspnetcore-react",
"start": "rimraf ./build && react-scripts start",
"build": "react-scripts build",
"test": "start-server-and-test start http-get://localhost:44472 cy:run",
"test": "start-server-and-test start http-get://127.0.0.1:44472 cy:run",
"eject": "react-scripts eject",
"lint": "eslint ./src/ && eslint ./cypress/",
"cy:run": "cypress run",
Expand Down

0 comments on commit afce6a6

Please sign in to comment.