Compare commits

..

No commits in common. "61285d6bc4dd4b7b90fbbb530c704be8e43853d7" and "76a335109072bad0dd370c424856fb8db610823a" have entirely different histories.

5 changed files with 25 additions and 28 deletions

View File

@ -12,12 +12,10 @@ open Giraffe
open dotenv.net
open Npgsql.FSharp
DotEnv.Load(DotEnvOptions(envFilePaths = [ "../.prod.env" ], overwriteExistingVars = false))
let prodEnv = DotEnv.Read(DotEnvOptions(envFilePaths = [ "../.prod.env"], overwriteExistingVars = false))
let connStr = Environment.GetEnvironmentVariable("DATABASE_URL")
.Replace("postgresql://", "postgres://")
.Replace("?sslmode=require", "")
let apiKey = Environment.GetEnvironmentVariable("API_KEY")
let ( _ , connStr ) = prodEnv.TryGetValue("DATABASE_URL")
let ( _ , apiKey ) = prodEnv.TryGetValue("API_KEY")
let validateApiKey (ctx : HttpContext) =
match ctx.TryGetRequestHeader "X-API-Key" with
@ -107,7 +105,8 @@ let main args =
fun webHostBuilder ->
webHostBuilder
.ConfigureKestrel(fun opt ->
opt.AddServerHeader <- false)
opt.AddServerHeader <- false
opt.ListenLocalhost(3333, (fun o -> o.UseHttps() |> ignore)))
.Configure(Action<IApplicationBuilder> configureApp)
.ConfigureServices(configureServices)
.ConfigureLogging(configureLogging)

View File

@ -2,7 +2,7 @@
<configuration>
<system.webServer>
<handlers>
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
</handlers>
<aspNetCore processPath="dotnet" arguments="CurrencyAPI.dll" stdoutLogEnabled="false" stdoutLogFile="logs/stdout" />
</system.webServer>

View File

@ -10,16 +10,14 @@ RUN dotnet tool restore
RUN dotnet restore "CurrencyAPI/CurrencyAPI.fsproj"
WORKDIR "/src/CurrencyAPI/"
WORKDIR "/src/Bot"
RUN dotnet build "CurrencyAPI.fsproj" -c Release -o /app/build
FROM build AS publish
RUN dotnet publish "CurrencyAPI.fsproj" -c Release -o /app/publish --no-restore
RUN dotnet publish "CurrencyAPI.fsproj" -c Release -o /app/publish
FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
EXPOSE 80
EXPOSE 443
ENTRYPOINT [ "dotnet", "./CurrencyAPI.App.dll" ]
ENTRYPOINT "./CurrencyAPI.App"