jamsch0/groceries
1
0
Fork 0
Code Issues Pull Requests Actions Packages Activity

Compare commits

base: jamsch0:6abff69bcb0e429158b037ecb2977097d12dac71
Branches Tags
jamsch0:main
...
compare: jamsch0:80664784470ad1422a0a92fbf4462b519f9cd66b
Branches Tags
jamsch0:main

2 Commits
6abff69bcb ... 8066478447

Author SHA1 Message Date
James Chapman
8066478447
Simplify copying csproj files in Docker build
All checks were successful
Docker Image CI / build (push) Successful in 1m41s
Details
2024-07-11 21:46:55 +01:00
James Chapman
4c62cded56
Enable X-Forwarded-* headers using env var instead of code 2024-07-11 21:45:04 +01:00
2 changed files with 4 additions and 11 deletions
Show Stats Expand all files Collapse all files

6
Dockerfile
View File

@ -1,3 +1,5 @@
# syntax=docker/dockerfile:1.7-labs
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build1 FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build1
WORKDIR /src WORKDIR /src
@ -14,8 +16,7 @@ WORKDIR /src
COPY ./Groceries.sln ./ COPY ./Groceries.sln ./
COPY ./Directory.Build.props ./ COPY ./Directory.Build.props ./
COPY */*.csproj ./ COPY --parents */*.csproj .
RUN for file in $(ls *.csproj); do mkdir -p ${file%.*} && mv $file ${file%.*}; done
RUN dotnet restore RUN dotnet restore
COPY . ./ COPY . ./
@ -30,6 +31,7 @@ COPY --from=build2 /src/Groceries/config.ini /config/
RUN apk add --no-cache icu-libs tzdata RUN apk add --no-cache icu-libs tzdata
ENV ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
ENV ASPNETCORE_HTTP_PORTS=80 ENV ASPNETCORE_HTTP_PORTS=80
ENV DOTNET_ENABLEDIAGNOSTICS=0 ENV DOTNET_ENABLEDIAGNOSTICS=0
ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false

9
Groceries/Program.cs
View File

@ -1,7 +1,6 @@
using DbUp; using DbUp;
using Groceries.Data; using Groceries.Data;
using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
@ -29,13 +28,6 @@ if (!dbUpgradeResult.Successful)
return -1; return -1;
} }
builder.Services.Configure<ForwardedHeadersOptions>(options =>
{
options.ForwardedHeaders = ForwardedHeaders.All;
options.KnownNetworks.Clear();
options.KnownProxies.Clear();
});
var dataProtection = builder.Services.AddDataProtection(); var dataProtection = builder.Services.AddDataProtection();
if (env.IsProduction()) if (env.IsProduction())
{ {
@ -59,7 +51,6 @@ builder.Services.AddDbContextPool<AppDbContext>(options => options
var app = builder.Build(); var app = builder.Build();
app.UseForwardedHeaders();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseRouting(); app.UseRouting();
app.UseSession(); app.UseSession();