Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions APSIM.Docs.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<ItemGroup>
<ProjectReference Include="..\ApsimX\APSIM.Documentation\APSIM.Documentation.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
</ItemGroup>
Expand All @@ -17,6 +13,6 @@
<!-- Required for build workaround with ApsimX -->
<PropertyGroup>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
</PropertyGroup>

</Project>
1 change: 0 additions & 1 deletion Components/Custom/DocLink.razor
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions Components/Layout/NavMenu.razor
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<div class="top-row ps-3 mb-5 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="/APSIM_Transparent-154x100.png" />
@* <span class="mt-3">APSIM Documentation</span> *@
<img src="APSIM_transparent-154x100.png" />
</a>
</div>
</div>
Expand Down
4 changes: 1 addition & 3 deletions Components/Pages/Home.razor
Original file line number Diff line number Diff line change
@@ -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 "/"
Expand Down
1 change: 0 additions & 1 deletion Components/Pages/Model.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@using APSIM.Documentation
@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
@using Components.Layout
@rendermode InteractiveServer
Expand Down
2 changes: 0 additions & 2 deletions Components/Pages/Models.razor
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using APSIM.Documentation
@using Newtonsoft.Json
@using Microsoft.AspNetCore.Mvc
@using APSIM.Docs.Components.State
@inject StateContainer StateContainer
Expand Down
2 changes: 0 additions & 2 deletions Components/Pages/Tutorial.razor
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using APSIM.Documentation
@using Newtonsoft.Json
@using Microsoft.AspNetCore.Mvc
@using APSIM.Docs.Components.State
@inject StateContainer StateContainer
Expand Down
1 change: 0 additions & 1 deletion Components/Pages/Tutorials.razor
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@using APSIM.Documentation
@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
@using Components.Layout
@rendermode InteractiveServer
Expand Down
2 changes: 0 additions & 2 deletions Components/Pages/Validation.razor
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@using APSIM.Documentation
@using Newtonsoft.Json
@using Microsoft.AspNetCore.Mvc
@using APSIM.Docs.Components.State
@inject StateContainer StateContainer
Expand Down
20 changes: 0 additions & 20 deletions dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Loading