Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Further updates for Dockerfile

KrzysztofPajakfee9009a8965
diff --git a/src/Plugins/Authentication.Google/Authentication.Google.csproj b/src/Plugins/Authentication.Google/Authentication.Google.csproj
index f959fac65..bfc075816 100644
--- a/src/Plugins/Authentication.Google/Authentication.Google.csproj
+++ b/src/Plugins/Authentication.Google/Authentication.Google.csproj
@@ -22,18 +22,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Authentication.Google\ref" />
</Target>
- <ItemGroup>
- <Content Include="Views\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Views\PublicInfo.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.5" />
</ItemGroup>
@@ -100,9 +88,18 @@
<None Update="logo.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\Configure.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Update="Views\PublicInfo.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
<None Update="Views\SignInFailed.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
diff --git a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
index 27dccca37..e2e622abb 100644
--- a/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
+++ b/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj
@@ -24,12 +24,6 @@
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
- <ItemGroup>
- <Content Include="Views\PaymentCashOnDelivery\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -85,6 +79,9 @@
<None Update="Views\PaymentCashOnDelivery\PaymentInfo.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\PaymentCashOnDelivery\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
index 4af832a50..41de6a234 100644
--- a/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
+++ b/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj
@@ -24,16 +24,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Payments.PayPalStandard\ref" />
</Target>
- <ItemGroup>
- <Content Include="Views\PaymentPayPalStandard\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
- <ItemGroup>
- <None Include="Components\PaymentPayPalStandardViewComponent.cs" />
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -90,6 +80,9 @@
<None Update="Views\PaymentPayPalStandard\PaymentInfo.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\PaymentPayPalStandard\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
index 1dc402b79..dd786d2ac 100644
--- a/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
+++ b/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj
@@ -24,11 +24,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ByWeight\ref" />
</Target>
- <ItemGroup>
- <Content Include="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -90,6 +85,9 @@
<None Update="Views\_CreateOrUpdate.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
index d5622123f..bff8ec4d5 100644
--- a/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
+++ b/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj
@@ -24,13 +24,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Shipping.ShippingPoint\ref" />
</Target>
- <ItemGroup>
- <Content Include="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- <OutDir>$(OutputPath)</OutDir>
- </Content>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -98,6 +91,9 @@
<None Update="Views\_CreateOrUpdate.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
index 5f414f17e..4dca90a3a 100644
--- a/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
+++ b/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj
@@ -24,12 +24,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.CountryStateZip\ref" />
</Target>
- <ItemGroup>
- <Content Include="Views\TaxCountryStateZip\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -82,6 +76,9 @@
<None Update="Views\TaxCountryStateZip\Configure.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\TaxCountryStateZip\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
index 99cbabc7d..fabb56804 100644
--- a/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
+++ b/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj
@@ -24,19 +24,6 @@
<RemoveDir Directories="..\..\Web\Grand.Web\Plugins\Tax.FixedRate\ref" />
</Target>
- <ItemGroup>
- <None Remove="Views\Configure.cshtml" />
- </ItemGroup>
-
- <ItemGroup>
- <Content Include="Views\Configure.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="Views\_ViewImports.cshtml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
-
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj">
<Private>false</Private>
@@ -89,6 +76,9 @@
<None Update="Views\Configure.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Update="Views\_ViewImports.cshtml">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Web/Grand.Web/Dockerfile b/src/Web/Grand.Web/Dockerfile
index 23c70c2e1..cd6f242c8 100644
--- a/src/Web/Grand.Web/Dockerfile
+++ b/src/Web/Grand.Web/Dockerfile
@@ -42,21 +42,21 @@ COPY ["src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj", "src/Plu
COPY ["src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj", "src/Plugins/Widgets.GoogleAnalytics/"]
COPY ["src/Plugins/Widgets.Slider/Widgets.Slider.csproj", "src/Plugins/Widgets.Slider/"]
-RUN dotnet build "src/src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj"
-RUN dotnet build "src/src/Plugins/Authentication.Google/Authentication.Google.csproj"
-RUN dotnet build "src/src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj""
-RUN dotnet build "src/src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj"
-RUN dotnet build "src/src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj"
-RUN dotnet build "src/src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj"
-RUN dotnet build "src/src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj"
-RUN dotnet build "src/src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj"
-RUN dotnet build "src/src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj"
-RUN dotnet build "src/src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj"
-RUN dotnet build "src/src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj"
-RUN dotnet build "src/src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj"
-RUN dotnet build "src/src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj"
-RUN dotnet build "src/src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj"
-RUN dotnet build "src/src/Plugins/Widgets.Slider/Widgets.Slider.csproj"
+RUN dotnet build "src/Plugins/Authentication.Facebook/Authentication.Facebook.csproj"
+RUN dotnet build "src/Plugins/Authentication.Google/Authentication.Google.csproj"
+RUN dotnet build "src/Plugins/DiscountRules.Standard/DiscountRules.Standard.csproj"
+RUN dotnet build "src/Plugins/ExchangeRate.McExchange/ExchangeRate.McExchange.csproj"
+RUN dotnet build "src/Plugins/Payments.BrainTree/Payments.BrainTree.csproj"
+RUN dotnet build "src/Plugins/Payments.CashOnDelivery/Payments.CashOnDelivery.csproj"
+RUN dotnet build "src/Plugins/Payments.PayPalStandard/Payments.PayPalStandard.csproj"
+RUN dotnet build "src/Plugins/Shipping.ByWeight/Shipping.ByWeight.csproj"
+RUN dotnet build "src/Plugins/Shipping.FixedRateShipping/Shipping.FixedRateShipping.csproj"
+RUN dotnet build "src/Plugins/Shipping.ShippingPoint/Shipping.ShippingPoint.csproj"
+RUN dotnet build "src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj"
+RUN dotnet build "src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj"
+RUN dotnet build "src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj"
+RUN dotnet build "src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj"
+RUN dotnet build "src/Plugins/Widgets.Slider/Widgets.Slider.csproj"
RUN dotnet restore "src/Web/Grand.Web/Grand.Web.csproj"
COPY . .
@@ -69,4 +69,4 @@ RUN dotnet publish "Grand.Web.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "Grand.Web.dll"]
+ENTRYPOINT ["dotnet", "Grand.Web.dll"]
\ No newline at end of file