Stevan/steves-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'chore: change docker build context to repo root' (#2) from stevanfreeborn/chore/change-docker-image-build-process into main

Browse Source
This commit is contained in:
Stevan Freeborn
2026-06-28 20:17:57 +00:00
parent 73b136064a cdcb9f9f75
commit c27889afa8
6 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/.dockerignore → .dockerignore
+1 -1
View File
@@ -10,4 +10,4 @@
**/Dockerfile* **/Dockerfile*
**/obj **/obj
.env* .env*
**/appsettings*.json **/appsettings*.json
.gitea/workflows/deploy.yml
+3 -2
View File
@@ -6,6 +6,7 @@ on:
- main - main
paths: paths:
- 'src/**' - 'src/**'
- '.editorconfig'
jobs: jobs:
build: build:
name: Build Docker Images name: Build Docker Images
@@ -26,10 +27,10 @@ jobs:
- name: Build Docker image - name: Build Docker image
run: | run: |
WORKER_TAG=${{ secrets.DOCKERHUB_USERNAME }}/steves-bot:worker-${{ steps.version.outputs.version }} WORKER_TAG=${{ secrets.DOCKERHUB_USERNAME }}/steves-bot:worker-${{ steps.version.outputs.version }}
docker build -f src/StevesBot.Worker.Dockerfile -t $WORKER_TAG src docker build -f src/StevesBot.Worker.Dockerfile -t $WORKER_TAG .
docker push $WORKER_TAG docker push $WORKER_TAG
WEBHOOK_TAG=${{ secrets.DOCKERHUB_USERNAME }}/steves-bot:webhook-${{ steps.version.outputs.version }} WEBHOOK_TAG=${{ secrets.DOCKERHUB_USERNAME }}/steves-bot:webhook-${{ steps.version.outputs.version }}
docker build -f src/StevesBot.Webhook.Dockerfile -t $WEBHOOK_TAG src docker build -f src/StevesBot.Webhook.Dockerfile -t $WEBHOOK_TAG .
docker push $WEBHOOK_TAG docker push $WEBHOOK_TAG
deploy: deploy:
name: Deploy Docker Images name: Deploy Docker Images
.gitea/workflows/pull_request.yml
+4 -2
View File
@@ -30,13 +30,15 @@ jobs:
with: with:
dotnet-version: 10.0.x dotnet-version: 10.0.x
- name: Install report generator - name: Install report generator
run: dotnet tool install -g dotnet-reportgenerator-globaltool run: |
dotnet tool install --tool-path ./.tools dotnet-reportgenerator-globaltool
echo "$PWD/.tools" >> "$GITHUB_PATH"
- name: Run tests - name: Run tests
run: dotnet test src run: dotnet test src
- name: Merge coverage reports - name: Merge coverage reports
run: reportgenerator "-reports:src/tests/*/TestResults/*/coverage.cobertura.xml" "-reporttypes:Html;Cobertura" "-targetdir:src/tests/TestResults/Coverage" run: reportgenerator "-reports:src/tests/*/TestResults/*/coverage.cobertura.xml" "-reporttypes:Html;Cobertura" "-targetdir:src/tests/TestResults/Coverage"
- name: Upload code coverage - name: Upload code coverage
uses: actions/upload-artifact@v6 uses: actions/upload-artifact@v3
with: with:
name: coverage-reports name: coverage-reports
path: src/tests/TestResults/Coverage path: src/tests/TestResults/Coverage
README.md
+7
View File
@@ -234,6 +234,13 @@ FROM mcr.microsoft.com/dotnet/aspnet:10.0
# ... runtime setup ... # ... runtime setup ...
``` ```
Images are built with the **repository root** as Docker build context so solution-wide configuration (including root-level analyzer/editorconfig rules) is available during build:
```bash
docker build -f src/StevesBot.Worker.Dockerfile -t steves-bot:worker .
docker build -f src/StevesBot.Webhook.Dockerfile -t steves-bot:webhook .
```
### Configuration for Production ### Configuration for Production
Use environment variables or configuration providers for production secrets. Use environment variables or configuration providers for production secrets.
src/StevesBot.Webhook.Dockerfile
+14 -17
View File
@@ -2,32 +2,29 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS base
WORKDIR /app WORKDIR /app
# solution level # solution level
COPY *.sln ./ COPY src/StevesBot.sln src/
COPY Directory.Build.props ./ COPY src/Directory.Build.props src/
# src level # src level
COPY src/StevesBot.Library/*.csproj src/StevesBot.Library/ COPY src/src/StevesBot.Library/*.csproj src/src/StevesBot.Library/
COPY src/StevesBot.Worker/*.csproj src/StevesBot.Worker/ COPY src/src/StevesBot.Worker/*.csproj src/src/StevesBot.Worker/
COPY src/StevesBot.Webhook/*.csproj src/StevesBot.Webhook/ COPY src/src/StevesBot.Webhook/*.csproj src/src/StevesBot.Webhook/
COPY src/Directory.Build.props src/ COPY src/src/Directory.Build.props src/src/
COPY src/Directory.Packages.props src/ COPY src/src/Directory.Packages.props src/src/
# test level # test level
COPY tests/StevesBot.Library.Tests/*.csproj tests/StevesBot.Library.Tests/ COPY src/tests/StevesBot.Library.Tests/*.csproj src/tests/StevesBot.Library.Tests/
COPY tests/StevesBot.Worker.Tests/*.csproj tests/StevesBot.Worker.Tests/ COPY src/tests/StevesBot.Worker.Tests/*.csproj src/tests/StevesBot.Worker.Tests/
COPY tests/StevesBot.Webhook.Tests/*.csproj tests/StevesBot.Webhook.Tests/ COPY src/tests/StevesBot.Webhook.Tests/*.csproj src/tests/StevesBot.Webhook.Tests/
COPY tests/Directory.Build.props tests/ COPY src/tests/Directory.Build.props src/tests/
COPY tests/Directory.Packages.props tests/ COPY src/tests/Directory.Packages.props src/tests/
COPY ./src/StevesBot.Worker/StevesBot.Worker.csproj ./ RUN dotnet restore src/StevesBot.sln
COPY ./Directory.Build.props ./
RUN dotnet restore StevesBot.sln
COPY . . COPY . .
FROM base AS publish-stage FROM base AS publish-stage
RUN dotnet publish -c Release -o dist src/StevesBot.Webhook/StevesBot.Webhook.csproj RUN dotnet publish -c Release -o dist src/src/StevesBot.Webhook/StevesBot.Webhook.csproj
FROM mcr.microsoft.com/dotnet/aspnet:10.0 FROM mcr.microsoft.com/dotnet/aspnet:10.0
WORKDIR /app WORKDIR /app
src/StevesBot.Worker.Dockerfile
+14 -17
View File
@@ -2,32 +2,29 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0 AS base
WORKDIR /app WORKDIR /app
# solution level # solution level
COPY *.sln ./ COPY src/StevesBot.sln src/
COPY Directory.Build.props ./ COPY src/Directory.Build.props src/
# src level # src level
COPY src/StevesBot.Library/*.csproj src/StevesBot.Library/ COPY src/src/StevesBot.Library/*.csproj src/src/StevesBot.Library/
COPY src/StevesBot.Worker/*.csproj src/StevesBot.Worker/ COPY src/src/StevesBot.Worker/*.csproj src/src/StevesBot.Worker/
COPY src/StevesBot.Webhook/*.csproj src/StevesBot.Webhook/ COPY src/src/StevesBot.Webhook/*.csproj src/src/StevesBot.Webhook/
COPY src/Directory.Build.props src/ COPY src/src/Directory.Build.props src/src/
COPY src/Directory.Packages.props src/ COPY src/src/Directory.Packages.props src/src/
# test level # test level
COPY tests/StevesBot.Library.Tests/*.csproj tests/StevesBot.Library.Tests/ COPY src/tests/StevesBot.Library.Tests/*.csproj src/tests/StevesBot.Library.Tests/
COPY tests/StevesBot.Worker.Tests/*.csproj tests/StevesBot.Worker.Tests/ COPY src/tests/StevesBot.Worker.Tests/*.csproj src/tests/StevesBot.Worker.Tests/
COPY tests/StevesBot.Webhook.Tests/*.csproj tests/StevesBot.Webhook.Tests/ COPY src/tests/StevesBot.Webhook.Tests/*.csproj src/tests/StevesBot.Webhook.Tests/
COPY tests/Directory.Build.props tests/ COPY src/tests/Directory.Build.props src/tests/
COPY tests/Directory.Packages.props tests/ COPY src/tests/Directory.Packages.props src/tests/
COPY ./src/StevesBot.Worker/StevesBot.Worker.csproj ./ RUN dotnet restore src/StevesBot.sln
COPY ./Directory.Build.props ./
RUN dotnet restore StevesBot.sln
COPY . . COPY . .
FROM base AS publish-stage FROM base AS publish-stage
RUN dotnet publish -c Release -o dist src/StevesBot.Worker/StevesBot.Worker.csproj RUN dotnet publish -c Release -o dist src/src/StevesBot.Worker/StevesBot.Worker.csproj
FROM mcr.microsoft.com/dotnet/aspnet:10.0 FROM mcr.microsoft.com/dotnet/aspnet:10.0
WORKDIR /app WORKDIR /app