GitIgnore fixes, DockerFile fixes

This commit is contained in:
Jānis Kacēns
2024-10-07 22:44:45 +03:00
parent 3889e684b4
commit 095e6baff3
60 changed files with 1236 additions and 436 deletions
+13
View File
@@ -0,0 +1,13 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/.idea.PosterMaker.iml
/modules.xml
/contentModel.xml
/projectSettingsUpdater.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
+1
View File
@@ -0,0 +1 @@
PosterMaker
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
+1027
View File
File diff suppressed because it is too large Load Diff
+44
View File
@@ -0,0 +1,44 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# compiled output
/dist
/dist-server
/tmp
/out-tsc
/bin
/obj
# dependencies
/node_modules
.angular
# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings
Resources/Uploads
# System Files
.DS_Store
Thumbs.db
+25 -16
View File
@@ -1,20 +1,29 @@
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build # Stage 1: Build
WORKDIR /build FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
# Copy the project file and restore dependencies
COPY PosterMaker.Core.csproj .
RUN dotnet restore PosterMaker.Core.csproj
# Copy the entire source code and build it
COPY . .
RUN dotnet build PosterMaker.Core.csproj -c Release -o /app/build
# Stage 2: Publish
FROM build AS publish
RUN dotnet publish PosterMaker.Core.csproj -c Release -o /app/publish
# Stage 3: Final
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS final
WORKDIR /app
# Set environment variables and expose port
ENV ASPNETCORE_URLS=http://+:80 ENV ASPNETCORE_URLS=http://+:80
EXPOSE 80 EXPOSE 80
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build # Copy the published app from the publish stage
WORKDIR /src
COPY ["PosterMaker.Core/PosterMaker.Core.csproj", "PosterMaker.Core/"]
RUN dotnet restore "PosterMaker.Core/PosterMaker.Core.csproj"
COPY . .
WORKDIR "/src/PosterMaker.Core"
RUN dotnet build "PosterMaker.Core.csproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "PosterMaker.Core.csproj" -c Release -o /app/publish
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "PosterMaker.Core.dll"]
# Set the entrypoint
ENTRYPOINT ["dotnet", "PosterMaker.Core.dll"]
@@ -25,5 +25,6 @@ public enum NetworkLogoEnum
AdultSwim, AdultSwim,
Max, Max,
Mtv, Mtv,
ChannelFour ChannelFour,
Id
} }
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48.947269mm" height="28.04015mm" viewBox="0 0 48.94727 28.04015" version="1.1" id="svg8" inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" sodipodi:docname="InvestigationDiscoveryLogo2020.svg">
<defs id="defs2">
<linearGradient id="linearGradient898" inkscape:collect="always">
<stop id="stop894" offset="0" style="stop-color:#f26b22;stop-opacity:1"/>
<stop style="stop-color:#ee2724;stop-opacity:1" offset="0.23663527" id="stop902"/>
<stop id="stop904" offset="0.76939183" style="stop-color:#ec2623;stop-opacity:1"/>
<stop id="stop896" offset="1" style="stop-color:#e62354;stop-opacity:1"/>
</linearGradient>
<linearGradient gradientTransform="matrix(0.26458333,0,0,0.26458333,-290.28571,0)" gradientUnits="userSpaceOnUse" y2="476.7041" x2="970.86047" y1="173.41211" x1="244.26758" id="linearGradient900" xlink:href="#linearGradient898" inkscape:collect="always"/>
</defs>
<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-388.9298" inkscape:cy="-244.15362" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1366" inkscape:window-height="705" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1"/>
<metadata id="metadata5">
<rdf:RDF>
<cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title/>
</cc:Work>
</rdf:RDF>
</metadata>
<g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-79.847795,-56.194209)">
<g transform="matrix(0.25,0,0,0.25,136.26194,44.723721)" id="layer1-6" inkscape:label="Layer 1">
<path inkscape:connector-curvature="0" id="rect832-0" d="M -225.65658,45.881954 V 121.7812 l 45.49179,10.34303 V 45.881954 Z m 62.00655,0 v 58.273446 31.72364 l 97.480866,22.16351 c 21.67156,-7.83571 36.301659,-25.84124 36.301659,-53.88715 0,-38.924531 -28.34908,-58.273446 -63.950101,-58.273446 z m 45.44166,31.874023 h 18.78749 c 12.051308,0 21.804352,8.505869 21.804352,26.467633 0,14.77222 -7.026725,26.46815 -21.851895,26.46815 h -18.739947 z" style="opacity:1;vector-effect:none;fill:url(#linearGradient900);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5.43762016;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
</g>
</g>
<script xmlns=""/></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

@@ -109,6 +109,7 @@ public class MovieLogoService : IMovieLogoService
NetworkLogoEnum.Max => "Max.svg", NetworkLogoEnum.Max => "Max.svg",
NetworkLogoEnum.Mtv => "MTV.svg", NetworkLogoEnum.Mtv => "MTV.svg",
NetworkLogoEnum.ChannelFour => "ChannelFour.png", NetworkLogoEnum.ChannelFour => "ChannelFour.png",
NetworkLogoEnum.Id => "ID.svg",
_ => throw new ArgumentOutOfRangeException(nameof(logo), logo, null) _ => throw new ArgumentOutOfRangeException(nameof(logo), logo, null)
}; };
} }
@@ -189,7 +189,7 @@ public class SeriesPosterMakerService : ISeriesPosterMakerService
image2 = new MagickImage(imageWithSeason); image2 = new MagickImage(imageWithSeason);
} }
if (properties.LimitedSeries == true) if (properties.LimitedSeries != null && properties.LimitedSeries == true)
{ {
seasonImages.Add(labels); seasonImages.Add(labels);
readSettings.TextInterlineSpacing = 150; readSettings.TextInterlineSpacing = 150;
@@ -1,4 +0,0 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v7.0", FrameworkDisplayName = ".NET 7.0")]
@@ -1,23 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("ImageMagick")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("ImageMagick")]
[assembly: System.Reflection.AssemblyTitleAttribute("ImageMagick")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
@@ -1 +0,0 @@
b2f83d90c15ea01b7ea8240c12d46cf015aa5f06
@@ -1,17 +0,0 @@
is_global = true
build_property.TargetFramework = net7.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb = true
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = ImageMagick
build_property.RootNamespace = ImageMagick
build_property.ProjectDir = C:\Projects\ImageMagick\ImageMagick\
build_property.RazorLangVersion = 7.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = C:\Projects\ImageMagick\ImageMagick
build_property._RazorSourceGeneratorDebug =
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
2a1610f8da560500750f3f06f5d0616aa414a7a7abdd43f93b025a6f2a2c72be
@@ -1,19 +0,0 @@
is_global = true
build_property.TargetFramework = net7.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb = true
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = PosterMaker
build_property.RootNamespace = PosterMaker
build_property.ProjectDir = C:\Projects\PosterMaker\PosterMaker.Core\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.RazorLangVersion = 7.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = C:\Projects\PosterMaker\PosterMaker.Core
build_property._RazorSourceGeneratorDebug =
@@ -1,110 +0,0 @@
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\appsettings.Development.json
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\appsettings.json
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.exe
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.deps.json
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.runtimeconfig.json
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.pdb
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Magick.NET-Q8-AnyCPU.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Magick.NET.Core.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Microsoft.AspNetCore.OpenApi.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Microsoft.Extensions.DependencyModel.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Microsoft.OpenApi.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.AspNetCore.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Extensions.Hosting.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Extensions.Logging.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Formatting.Compact.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Settings.Configuration.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Console.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Debug.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.File.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.PeriodicBatching.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Seq.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.Swagger.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerGen.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerUI.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-arm64\native\Magick.Native-Q8-arm64.dll.so
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-musl-x64\native\Magick.Native-Q8-x64.dll.so
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-x64\native\Magick.Native-Q8-x64.dll.so
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\osx-arm64\native\Magick.Native-Q8-arm64.dll.dylib
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\osx-x64\native\Magick.Native-Q8-x64.dll.dylib
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-arm64\native\Magick.Native-Q8-arm64.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-x64\native\Magick.Native-Q8-x64.dll
C:\Projects\ImageMagick\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-x86\native\Magick.Native-Q8-x86.dll
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.AssemblyReference.cache
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.GeneratedMSBuildEditorConfig.editorconfig
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.AssemblyInfoInputs.cache
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.AssemblyInfo.cs
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.CoreCompileInputs.cache
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.MvcApplicationPartsAssemblyInfo.cs
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.MvcApplicationPartsAssemblyInfo.cache
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.PosterMaker.Core.Microsoft.AspNetCore.StaticWebAssets.props
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.build.PosterMaker.Core.props
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.buildMultiTargeting.PosterMaker.Core.props
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.buildTransitive.PosterMaker.Core.props
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.pack.json
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.build.json
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.development.json
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\scopedcss\bundle\PosterMaker.Core.styles.css
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.CopyComplete
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.dll
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\refint\PosterMaker.Core.dll
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.pdb
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.genruntimeconfig.cache
C:\Projects\ImageMagick\PosterMaker.Core\obj\Debug\net7.0\ref\PosterMaker.Core.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\appsettings.Development.json
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\appsettings.json
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.exe
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.deps.json
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.runtimeconfig.json
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\PosterMaker.Core.pdb
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Magick.NET-Q8-AnyCPU.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Magick.NET.Core.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Microsoft.AspNetCore.OpenApi.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Microsoft.Extensions.DependencyModel.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Microsoft.OpenApi.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.AspNetCore.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Extensions.Hosting.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Extensions.Logging.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Formatting.Compact.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Settings.Configuration.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Console.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Debug.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.File.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.PeriodicBatching.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Serilog.Sinks.Seq.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.Swagger.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerGen.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\Swashbuckle.AspNetCore.SwaggerUI.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-arm64\native\Magick.Native-Q8-arm64.dll.so
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-musl-x64\native\Magick.Native-Q8-x64.dll.so
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\linux-x64\native\Magick.Native-Q8-x64.dll.so
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\osx-arm64\native\Magick.Native-Q8-arm64.dll.dylib
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\osx-x64\native\Magick.Native-Q8-x64.dll.dylib
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-arm64\native\Magick.Native-Q8-arm64.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-x64\native\Magick.Native-Q8-x64.dll
C:\Projects\PosterMaker\PosterMaker.Core\bin\Debug\net7.0\runtimes\win-x86\native\Magick.Native-Q8-x86.dll
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.AssemblyReference.cache
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.GeneratedMSBuildEditorConfig.editorconfig
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.AssemblyInfoInputs.cache
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.AssemblyInfo.cs
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.CoreCompileInputs.cache
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.MvcApplicationPartsAssemblyInfo.cs
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.MvcApplicationPartsAssemblyInfo.cache
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.build.json
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.development.json
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.PosterMaker.Core.Microsoft.AspNetCore.StaticWebAssets.props
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.build.PosterMaker.Core.props
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.buildMultiTargeting.PosterMaker.Core.props
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets\msbuild.buildTransitive.PosterMaker.Core.props
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\staticwebassets.pack.json
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\scopedcss\bundle\PosterMaker.Core.styles.css
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.csproj.CopyComplete
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.dll
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\refint\PosterMaker.Core.dll
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.pdb
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\PosterMaker.Core.genruntimeconfig.cache
C:\Projects\PosterMaker\PosterMaker.Core\obj\Debug\net7.0\ref\PosterMaker.Core.dll
Binary file not shown.
@@ -1,11 +0,0 @@
{
"Version": 1,
"Hash": "1/ilGUxjwHdeBx3AY2ebJTX4dksAukNKb32w0ycjCe4=",
"Source": "PosterMaker.Core",
"BasePath": "_content/PosterMaker.Core",
"Mode": "Default",
"ManifestType": "Build",
"ReferencedProjectsConfiguration": [],
"DiscoveryPatterns": [],
"Assets": []
}
@@ -1,3 +0,0 @@
<Project>
<Import Project="..\buildMultiTargeting\ImageMagick.props" />
</Project>
@@ -1,22 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("PosterMaker.Core")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyProductAttribute("PosterMaker.Core")]
[assembly: System.Reflection.AssemblyTitleAttribute("PosterMaker.Core")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
// Generated by the MSBuild WriteCodeFragment class.
@@ -1 +0,0 @@
2a1610f8da560500750f3f06f5d0616aa414a7a7abdd43f93b025a6f2a2c72be
@@ -1,19 +0,0 @@
is_global = true
build_property.TargetFramework = net8.0
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb = true
build_property.ProjectTypeGuids =
build_property.InvariantGlobalization =
build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = PosterMaker
build_property.RootNamespace = PosterMaker
build_property.ProjectDir = C:\Projects\PosterMaker\PosterMaker.Core\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.RazorLangVersion = 8.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
build_property.MSBuildProjectDirectory = C:\Projects\PosterMaker\PosterMaker.Core
build_property._RazorSourceGeneratorDebug =
@@ -1,17 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
using System;
using System.Reflection;
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Microsoft.AspNetCore.OpenApi")]
[assembly: Microsoft.AspNetCore.Mvc.ApplicationParts.ApplicationPartAttribute("Swashbuckle.AspNetCore.SwaggerGen")]
// Generated by the MSBuild WriteCodeFragment class.
@@ -1 +0,0 @@
b7b67fad782a3c4cdbdc38c9bb4c8a65d81aac4631af9d1576ae816eea28797f
@@ -1 +0,0 @@
8f4daa013dc0bf04ced90a6a25d408504232911687a8da2a6703d2664895d8a5
Binary file not shown.
@@ -1,11 +0,0 @@
{
"Version": 1,
"Hash": "1/ilGUxjwHdeBx3AY2ebJTX4dksAukNKb32w0ycjCe4=",
"Source": "PosterMaker.Core",
"BasePath": "_content/PosterMaker.Core",
"Mode": "Default",
"ManifestType": "Build",
"ReferencedProjectsConfiguration": [],
"DiscoveryPatterns": [],
"Assets": []
}
@@ -1,3 +0,0 @@
<Project>
<Import Project="Microsoft.AspNetCore.StaticWebAssets.props" />
</Project>
@@ -1,3 +0,0 @@
<Project>
<Import Project="..\build\PosterMaker.Core.props" />
</Project>
@@ -1,3 +0,0 @@
<Project>
<Import Project="..\buildMultiTargeting\PosterMaker.Core.props" />
</Project>
@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\JanisKa\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\JanisKa\.nuget\packages\" />
<SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props')" />
<Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props')" />
</ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\JanisKa\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
</PropertyGroup>
</Project>
@@ -1,93 +0,0 @@
{
"format": 1,
"restore": {
"C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj": {}
},
"projects": {
"C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj",
"projectName": "PosterMaker.Core",
"projectPath": "C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj",
"packagesPath": "C:\\Users\\JanisKa\\.nuget\\packages\\",
"outputPath": "C:\\Projects\\PosterMaker\\PosterMaker.Core\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
"C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
],
"configFilePaths": [
"C:\\Users\\JanisKa\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net8.0"
],
"sources": {
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
"C:\\Program Files\\dotnet\\library-packs": {},
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net8.0": {
"targetAlias": "net8.0",
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"net8.0": {
"targetAlias": "net8.0",
"dependencies": {
"Magick.NET-Q8-AnyCPU": {
"target": "Package",
"version": "[13.6.0, )"
},
"Microsoft.AspNetCore.OpenApi": {
"target": "Package",
"version": "[8.0.2, )"
},
"Serilog.AspNetCore": {
"target": "Package",
"version": "[8.0.1, )"
},
"Serilog.Sinks.Seq": {
"target": "Package",
"version": "[6.0.0, )"
},
"Swashbuckle.AspNetCore": {
"target": "Package",
"version": "[6.5.0, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48",
"net481"
],
"assetTargetFallback": true,
"warn": true,
"frameworkReferences": {
"Microsoft.AspNetCore.App": {
"privateAssets": "none"
},
"Microsoft.NETCore.App": {
"privateAssets": "all"
}
},
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.101/PortableRuntimeIdentifierGraph.json"
}
}
}
}
}
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.binder\8.0.0\buildTransitive\netstandard2.0\Microsoft.Extensions.Configuration.Binder.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.binder\8.0.0\buildTransitive\netstandard2.0\Microsoft.Extensions.Configuration.Binder.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.options\8.0.0\buildTransitive\net6.0\Microsoft.Extensions.Options.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.options\8.0.0\buildTransitive\net6.0\Microsoft.Extensions.Options.targets')" />
<Import Project="$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.logging.abstractions\8.0.0\buildTransitive\net6.0\Microsoft.Extensions.Logging.Abstractions.targets')" />
<Import Project="$(NuGetPackageRoot)magick.net-q8-anycpu\13.6.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets" Condition="Exists('$(NuGetPackageRoot)magick.net-q8-anycpu\13.6.0\build\netstandard20\Magick.NET-Q8-AnyCPU.targets')" />
</ImportGroup>
</Project>
@@ -1 +0,0 @@
"restore":{"projectUniqueName":"C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj","projectName":"PosterMaker.Core","projectPath":"C:\\Projects\\PosterMaker\\PosterMaker.Core\\PosterMaker.Core.csproj","outputPath":"C:\\Projects\\PosterMaker\\PosterMaker.Core\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"],"originalTargetFrameworks":["net8.0"],"sources":{"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\":{},"C:\\Program Files\\dotnet\\library-packs":{},"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"Magick.NET-Q8-AnyCPU":{"target":"Package","version":"[13.6.0, )"},"Microsoft.AspNetCore.OpenApi":{"target":"Package","version":"[8.0.2, )"},"Serilog.AspNetCore":{"target":"Package","version":"[8.0.1, )"},"Serilog.Sinks.Seq":{"target":"Package","version":"[6.0.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\8.0.101/PortableRuntimeIdentifierGraph.json"}}
+1
View File
@@ -8,6 +8,7 @@
# dependencies # dependencies
/node_modules /node_modules
.angular
# IDEs and editors # IDEs and editors
/.idea /.idea
@@ -31,7 +31,8 @@
<div *ngIf="retrievedImage"> <div *ngIf="retrievedImage">
<h2>Image</h2> <h2>Image</h2>
<img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight"> <img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight" [title]="imageTitle">
<button mat-raised-button color="primary" (click)="downloadImage()">Download Image</button>
</div> </div>
</div> </div>
</div> </div>
@@ -17,6 +17,7 @@ export class CollectionComponent {
title2: any; title2: any;
selectedLogoControl = new FormControl(); selectedLogoControl = new FormControl();
logoOptionControl = new FormControl(); logoOptionControl = new FormControl();
imageTitle: any;
constructor(private http: HttpClient) constructor(private http: HttpClient)
{ {
@@ -39,15 +40,25 @@ export class CollectionComponent {
fd.append('title', this.title); fd.append('title', this.title);
fd.append('title2', this.title2); fd.append('title2', this.title2);
this.http.post('https://localhost:44369/poster/collection', fd) this.http.post('http://localhost:44369/poster/collection', fd)
.subscribe(res => { .subscribe(res => {
console.log(res); console.log(res);
this.retrieveResponse = res; this.retrieveResponse = res;
this.base64Data = this.retrieveResponse.picBytes; this.base64Data = this.retrieveResponse.picBytes;
this.retrievedImage = 'data:image/jpeg;base64,' + this.base64Data; this.retrievedImage = 'data:image/jpeg;base64,' + this.base64Data;
this.imageTitle = 'poster';
}); });
} }
downloadImage(): void {
if (this.retrievedImage) {
const link = document.createElement('a');
link.href = this.retrievedImage;
link.download = `${this.imageTitle}.jpeg`; // Specify the filename here
link.click();
}
}
@HostListener('window:resize') @HostListener('window:resize')
onResize() { onResize() {
this.windowHeight = window.innerHeight - 200; this.windowHeight = window.innerHeight - 200;
@@ -61,6 +61,7 @@
<div *ngIf="retrievedImage"> <div *ngIf="retrievedImage">
<h2>Image</h2> <h2>Image</h2>
<img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight"> <img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight">
<button mat-raised-button color="primary" (click)="downloadImage()">Download Image</button>
</div> </div>
</div> </div>
</div> </div>
@@ -23,6 +23,7 @@ export class MovieComponent {
logoOptions = LogoOptions logoOptions = LogoOptions
selectedLogoControl = new FormControl(); selectedLogoControl = new FormControl();
logoOptionControl = new FormControl(); logoOptionControl = new FormControl();
imageTitle = 'poster'
constructor(private http: HttpClient) constructor(private http: HttpClient)
{ {
@@ -54,7 +55,7 @@ export class MovieComponent {
fd.append('logoOption', this.logoOptionControl.value); fd.append('logoOption', this.logoOptionControl.value);
} }
this.http.post('https://localhost:44369/poster/movie', fd) this.http.post('http://localhost:44369/poster/movie', fd)
.subscribe(res => { .subscribe(res => {
console.log(res); console.log(res);
this.retrieveResponse = res; this.retrieveResponse = res;
@@ -63,6 +64,15 @@ export class MovieComponent {
}); });
} }
downloadImage(): void {
if (this.retrievedImage) {
const link = document.createElement('a');
link.href = this.retrievedImage;
link.download = `${this.imageTitle}.jpeg`; // Specify the filename here
link.click();
}
}
@HostListener('window:resize') @HostListener('window:resize')
onResize() { onResize() {
this.windowHeight = window.innerHeight - 200; this.windowHeight = window.innerHeight - 200;
@@ -32,5 +32,6 @@ export enum NetworkLogos {
AdultSwim = "Adult Swim", AdultSwim = "Adult Swim",
Max = "Max", Max = "Max",
Mtv = "Mtv", Mtv = "Mtv",
ChannelFour = "ChannelFour" ChannelFour = "ChannelFour",
Id = "ID"
} }
@@ -72,7 +72,8 @@
<div *ngIf="retrievedImage"> <div *ngIf="retrievedImage">
<h2>Image</h2> <h2>Image</h2>
<img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight"> <img [src]="retrievedImage" alt="Upload Image" [style.height.px]="windowHeight" [title]='imageTitle'>
<button mat-raised-button color="primary" (click)="downloadImage()">Download Image</button>
</div> </div>
</div> </div>
</div> </div>
@@ -27,6 +27,7 @@ export class SeriesComponent {
logoOptionControl = new FormControl(); logoOptionControl = new FormControl();
selectedStudioControl = new FormControl(); selectedStudioControl = new FormControl();
isLimitedSeries: any; isLimitedSeries: any;
imageTitle: any;
constructor(private http: HttpClient) constructor(private http: HttpClient)
{ {
@@ -61,15 +62,25 @@ export class SeriesComponent {
if (this.logoOptionControl.value != null){ if (this.logoOptionControl.value != null){
fd.append('logoOption', this.logoOptionControl.value); fd.append('logoOption', this.logoOptionControl.value);
} }
this.http.post('https://localhost:44369/poster/series', fd) this.http.post('http://localhost:44369/poster/series', fd)
.subscribe(res => { .subscribe(res => {
console.log(res); console.log(res);
this.retrieveResponse = res; this.retrieveResponse = res;
this.base64Data = this.retrieveResponse.picBytes; this.base64Data = this.retrieveResponse.picBytes;
this.retrievedImage = 'data:image/jpeg;base64,' + this.base64Data; this.retrievedImage = 'data:image/jpeg;base64,' + this.base64Data;
this.imageTitle = 'poster';
}); });
} }
downloadImage(): void {
if (this.retrievedImage) {
const link = document.createElement('a');
link.href = this.retrievedImage;
link.download = `${this.imageTitle}.jpeg`; // Specify the filename here
link.click();
}
}
@HostListener('window:resize') @HostListener('window:resize')
onResize() { onResize() {
this.windowHeight = window.innerHeight - 200; this.windowHeight = window.innerHeight - 200;
+31 -14
View File
@@ -1,27 +1,44 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app WORKDIR /app
EXPOSE 44404 EXPOSE 80
ENV ASPNETCORE_URLS=http://*:44404 EXPOSE 443
# Copy the certificate
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY aspnetcore.pfx /https/aspnetcore.pfx
RUN ls /https && ls /https/aspnetcore.pfx && echo "Certificate copied successfully."
ENV ASPNETCORE_URLS=https://+;http://+
ENV ASPNETCORE_HTTPS_PORT=443
ENV ASPNETCORE_Kestrel__Certificates__Default__Password=test
ENV ASPNETCORE_Kestrel__Certificates__Default__Path=/https/aspnetcore.pfx
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
# Install Node.js # Install Node.js
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
&& apt-get install -y \ && apt-get install -y nodejs \
nodejs \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /src WORKDIR /src
COPY ["PosterMaker.UI/PosterMaker.UI.csproj", "PosterMaker.UI/"] COPY PosterMaker.UI.csproj .
RUN dotnet restore "PosterMaker.UI/PosterMaker.UI.csproj" RUN dotnet restore PosterMaker.UI.csproj
COPY . . COPY . .
WORKDIR "/src/PosterMaker.UI"
RUN dotnet build "PosterMaker.UI.csproj" -c Release -o /app/build # Build Angular app
WORKDIR "/src/ClientApp"
RUN npm install
RUN npm run build --prod
# Build .NET app
WORKDIR "/src"
RUN dotnet build PosterMaker.UI.csproj -c Release -o /app/build
FROM build AS publish FROM build AS publish
RUN dotnet publish "PosterMaker.UI.csproj" -c Release -o /app/publish /p:UseAppHost=false RUN dotnet publish PosterMaker.UI.csproj -c Release -o /app/publish /p:UseAppHost=false
FROM base AS final FROM base AS final
WORKDIR /app WORKDIR /app
COPY --from=publish /app/publish . COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "PosterMaker.UI.dll"]
# Copy Angular build output to wwwroot
COPY --from=build /src/ClientApp/dist /app/wwwroot
# Ensure SpaProxy properly configured
ENTRYPOINT ["dotnet", "PosterMaker.UI.dll"]
+2
View File
@@ -8,3 +8,5 @@
}, },
"AllowedHosts": "*" "AllowedHosts": "*"
} }