Merge pull request #149 from TomaszKandula/dev

merge: dev to master
TomaszKandula · Apr 21, 2024 · 5d08cdf · 5d08cdf
2 parents f9794e7 + a73fe7d
commit 5d08cdf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,8 @@ services:
       dockerfile: dockerfile
     hostname: emailsender
     ports:
-      - "5010:443"
+      - "80:8080"
+      - "443:8081"
     volumes:
       - /opt/configs/emailsender-apis-prod.json:/app/appsettings.Production.json:ro
-      - /opt/certs/wildcard-emailsender.dev.pfx:/app/certs/wildcard-emailsender.dev.pfx:ro
+      - /opt/certs/wildcard-emailsender.dev.pfx:/https/wildcard-emailsender.dev.pfx:ro
diff --git a/dockerfile b/dockerfile
@@ -45,7 +45,9 @@ ARG ENV_VALUE
 ARG PFX_PASSWORD
 ENV ASPNETCORE_ENVIRONMENT=${ENV_VALUE}
 ENV ASPNETCORE_Kestrel__Certificates__Default__Password=${PFX_PASSWORD}
-ENV ASPNETCORE_Kestrel__Certificates__Default__Path=/app/certs/wildcard-emailsender.dev.pfx
-ENV ASPNETCORE_URLS=https://+:443
-EXPOSE 443
+ENV ASPNETCORE_Kestrel__Certificates__Default__Path=/https/wildcard-emailsender.dev.pfx
+ENV ASPNETCORE_HTTPS_PORT=8081
+ENV ASPNETCORE_URLS=https://+:8081;http://+:8080
+EXPOSE 8080
+EXPOSE 8081
 ENTRYPOINT ["dotnet", "EmailSender.WebApi.dll"]