diff --git a/APSIM.Docs.csproj b/APSIM.Docs.csproj index dd59514..8635d37 100644 --- a/APSIM.Docs.csproj +++ b/APSIM.Docs.csproj @@ -1,9 +1,5 @@ - - - - @@ -17,6 +13,6 @@ false - + diff --git a/Components/Custom/DocLink.razor b/Components/Custom/DocLink.razor index ca0152e..dc56de3 100644 --- a/Components/Custom/DocLink.razor +++ b/Components/Custom/DocLink.razor @@ -1,7 +1,6 @@ @using APSIM.Docs.Components.State @using Microsoft.AspNetCore.Http @using Microsoft.AspNetCore.Mvc -@using APSIM.Documentation.Models @using System @inject StateContainer StateContainer @inject NavigationManager NavigationManager diff --git a/Components/Layout/NavMenu.razor b/Components/Layout/NavMenu.razor index 00b07a4..ee70d7b 100644 --- a/Components/Layout/NavMenu.razor +++ b/Components/Layout/NavMenu.razor @@ -1,8 +1,7 @@  diff --git a/Components/Pages/Home.razor b/Components/Pages/Home.razor index 34dcf1d..1a4aa41 100644 --- a/Components/Pages/Home.razor +++ b/Components/Pages/Home.razor @@ -1,6 +1,4 @@ -@using APSIM.Documentation -@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage -@using Newtonsoft.Json +@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer @page "/" diff --git a/Components/Pages/Model.razor b/Components/Pages/Model.razor index aab0d5f..d069bf4 100644 --- a/Components/Pages/Model.razor +++ b/Components/Pages/Model.razor @@ -1,4 +1,3 @@ -@using APSIM.Documentation @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Models.razor b/Components/Pages/Models.razor index e1d064d..8dfca0d 100644 --- a/Components/Pages/Models.razor +++ b/Components/Pages/Models.razor @@ -1,5 +1,3 @@ -@using APSIM.Documentation -@using Newtonsoft.Json @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorial.razor b/Components/Pages/Tutorial.razor index d97658e..0f30cad 100644 --- a/Components/Pages/Tutorial.razor +++ b/Components/Pages/Tutorial.razor @@ -1,5 +1,3 @@ -@using APSIM.Documentation -@using Newtonsoft.Json @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/Components/Pages/Tutorials.razor b/Components/Pages/Tutorials.razor index e415ecb..680f001 100644 --- a/Components/Pages/Tutorials.razor +++ b/Components/Pages/Tutorials.razor @@ -1,4 +1,3 @@ -@using APSIM.Documentation @using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage @using Components.Layout @rendermode InteractiveServer diff --git a/Components/Pages/Validation.razor b/Components/Pages/Validation.razor index 4a3d78f..4207741 100644 --- a/Components/Pages/Validation.razor +++ b/Components/Pages/Validation.razor @@ -1,5 +1,3 @@ -@using APSIM.Documentation -@using Newtonsoft.Json @using Microsoft.AspNetCore.Mvc @using APSIM.Docs.Components.State @inject StateContainer StateContainer diff --git a/dockerfile b/dockerfile index 64a09db..7365c9a 100644 --- a/dockerfile +++ b/dockerfile @@ -3,29 +3,9 @@ FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-noble AS build ARG TARGETARCH RUN echo ${TARGETARCH} - -# Get ApsimX dependencies. -WORKDIR / -RUN git clone https://github.com/APSIMInitiative/ApsimX.git -# COPY ../ApsimX /ApsimX -WORKDIR /ApsimX -RUN dotnet build - COPY . /apsimdocs WORKDIR /apsimdocs RUN dotnet publish APSIM.Docs.csproj -a amd64 -c Debug -o ../app - -# Runtime stage -# FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble -FROM apsiminitiative/rsensitivity -RUN apt -yq update && \ - apt install -y aspnetcore-runtime-8.0 && \ - apt install -y dotnet-runtime-8.0 - EXPOSE 8080 -WORKDIR / -COPY --link --from=build /app /app -COPY --link --from=build /ApsimX /ApsimX - WORKDIR /app ENTRYPOINT ["dotnet","APSIM.Docs.dll"]