Fix
This commit is contained in:
1 parent
94ea77266e
commit
3ca8082deb
3 files changed
+19
-5
No files matched your search
+1
-1
@@ -362,5 +362,5 @@ MigrationBackup/
|
|||||||
# Fody - auto-generated XML schema
|
# Fody - auto-generated XML schema
|
||||||
FodyWeavers.xsd
|
FodyWeavers.xsd
|
||||||
# SSL certificates - copy cert.pfx into certs/ before building the Docker image
|
# SSL certificates - copy cert.pfx into certs/ before building the Docker image
|
||||||
certs/
|
certs/*
|
||||||
!certs/.gitkeep
|
!certs/.gitkeep
|
||||||
+18
-4
@@ -1,5 +1,5 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0-preview AS base
|
||||||
RUN apt-get update && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
|
RUN apt-get update && apt-get upgrade -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
EXPOSE 8443
|
EXPOSE 8443
|
||||||
@@ -36,10 +36,24 @@ RUN mkdir -p /app/data
|
|||||||
ENV Hsts__Domain=nas.oneputleygreen.com
|
ENV Hsts__Domain=nas.oneputleygreen.com
|
||||||
|
|
||||||
# Copy the SSL certificate (CN=nas.oneputleygreen.com).
|
# Copy the SSL certificate (CN=nas.oneputleygreen.com).
|
||||||
# Place cert.pfx in the certs/ directory before building — it is excluded from git.
|
# Place cert.pfx in certs/ before building — excluded from git via certs/* in .gitignore.
|
||||||
|
# If cert.pfx is absent (e.g. CI builds) a self-signed fallback is generated automatically.
|
||||||
COPY certs/ /app/certs/
|
COPY certs/ /app/certs/
|
||||||
RUN test -f /app/certs/cert.pfx || \
|
RUN if [ ! -f /app/certs/cert.pfx ]; then \
|
||||||
(echo "ERROR: certs/cert.pfx not found. Copy your certificate into the certs/ directory before building." && exit 1)
|
echo "No cert.pfx found — generating self-signed certificate for ${Hsts__Domain}" && \
|
||||||
|
openssl req -x509 -newkey rsa:4096 \
|
||||||
|
-keyout /app/certs/key.pem \
|
||||||
|
-out /app/certs/cert.pem \
|
||||||
|
-days 3650 \
|
||||||
|
-nodes \
|
||||||
|
-subj "/C=GB/ST=England/O=Budgeteer/CN=${Hsts__Domain}" && \
|
||||||
|
openssl pkcs12 -export \
|
||||||
|
-out /app/certs/cert.pfx \
|
||||||
|
-inkey /app/certs/key.pem \
|
||||||
|
-in /app/certs/cert.pem \
|
||||||
|
-passout pass: && \
|
||||||
|
rm /app/certs/key.pem /app/certs/cert.pem; \
|
||||||
|
fi
|
||||||
|
|
||||||
# Serve on both HTTP and HTTPS
|
# Serve on both HTTP and HTTPS
|
||||||
ENV ASPNETCORE_HTTP_PORTS=8181
|
ENV ASPNETCORE_HTTP_PORTS=8181
|
||||||
|
|||||||
Whitespace-only changes.
Reference in new issue
Block a user