Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplified local docker setup for MVP site #237

Closed
wants to merge 2 commits into from
Closed

Simplified local docker setup for MVP site #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f27b4e5
Simplified local docker setup for MVP site, switched over to .NET6 Ho…
robearlam Feb 28, 2023
2c3279b
Merge branch 'main' into dotnet-hot-reload
robearlam Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,14 @@ services:
restart: ${DOCKER_RESTART}
build:
context: ./docker/build/rendering
target: ${BUILD_CONFIGURATION}
args:
DEBUG_BASE_IMAGE: ${NETCORE_BUILD_IMAGE}
RELEASE_BASE_IMAGE: ${NETCORE_RELEASE_IMAGE}
SOLUTION_IMAGE: ${REGISTRY}${COMPOSE_PROJECT_NAME}-solution:${VERSION:-latest}
ENTRYPOINT_ASSEMBLY: Mvp.Project.MvpSite.dll
ARTIFACTS_FOLDER: /artifacts/mvp-rendering
volumes:
- ${LOCAL_DEPLOY_PATH}\mvp-rendering:C:\deploy
- .\:C:\app
environment:
ENTRYPOINT_ASSEMBLY: Mvp.Project.MvpSite.dll
ASPNETCORE_ENVIRONMENT: "Development"
Expand Down
158 changes: 0 additions & 158 deletions docker/build/rendering/Development.ps1
View file
Open in desktop

This file was deleted.

18 changes: 2 additions & 16 deletions docker/build/rendering/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,9 @@ FROM ${DEBUG_BASE_IMAGE} as debug
ARG ARTIFACTS_FOLDER=/artifacts/mvp-rendering/

USER ContainerAdministrator
COPY ./Development.ps1 ./tools/
WORKDIR /app
COPY --from=solution ${ARTIFACTS_FOLDER} ./
WORKDIR /app/src/project/MvpSite/rendering
USER ContainerUser
ENV ASPNETCORE_URLS "http://+:80"
EXPOSE 80
ENTRYPOINT ["pwsh", "-File", "c:\\tools\\Development.ps1"]


# release image (aspnet)
FROM ${RELEASE_BASE_IMAGE} as release
ARG ENTRYPOINT_ASSEMBLY
ARG ARTIFACTS_FOLDER=/artifacts/mvp-rendering/

ENV ENTRYPOINT_ASSEMBLY="${ENTRYPOINT_ASSEMBLY}"
WORKDIR /app
COPY --from=solution ${ARTIFACTS_FOLDER} ./
EXPOSE 80
EXPOSE 443
ENTRYPOINT dotnet %ENTRYPOINT_ASSEMBLY%
ENTRYPOINT ["dotnet", "watch"]
19 changes: 10 additions & 9 deletions src/Project/MvpSite/rendering/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
{
"iisSettings": {
"windowsAuthentication": false,
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:64048",
Expand All @@ -16,18 +16,19 @@
}
},
"Mvp.Project.MvpSite.Rendering": {
"commandName": "Project",
"launchBrowser": false,
"applicationUrl": "http://*:80",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Mvp.Project.MvpSite.Rendering-VisualStudio": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"Docker": {
"commandName": "Docker",
"launchBrowser": true,
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
"publishAllPorts": true,
"useSSL": true
}
}
}
Expand Down