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

Jump to bottom

Fix docker build #299

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Fix docker build #299

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
fd313b3
fix(docker): Fix dbmirgrator docker image
AlmarAubel Dec 29, 2023
35b4947
fix(docker): Fix backend docker image
AlmarAubel Dec 29, 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
5 changes: 3 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ services:

mymeetingsdb:
build: ./src/Database/
platform: linux/amd64
ports:
- 1445:1433
networks:
Expand All @@ -26,8 +27,8 @@ services:
migrator:
container_name: mymeetings_db_migrator
build:
context: ./src/Database/
dockerfile: Dockerfile_DatabaseMigrator
context: ./src/
dockerfile: ./Database/Dockerfile_DatabaseMigrator
networks:
- starfish-crm-network
environment:
Expand Down
16 changes: 10 additions & 6 deletions src/Database/Dockerfile_DatabaseMigrator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@ WORKDIR /app
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src

COPY ["DatabaseMigrator/DatabaseMigrator.csproj", "DatabaseMigrator.csproj"]
COPY ["DatabaseMigrator/DatabaseMigrator.csproj", "DatabaseMigrator.csproj"]
COPY ["./Database/DatabaseMigrator/DatabaseMigrator.csproj", "DatabaseMigrator.csproj"]
COPY ["Directory.Packages.props", "Directory.Packages.props"]
COPY ["Directory.Build.targets", "Directory.Build.targets"]
COPY ["Directory.Build.props", "Directory.Build.props"]
COPY ["stylecop.json", "stylecop.json"]
COPY [".editorconfig", ".editorconfig"]

RUN dotnet restore "DatabaseMigrator.csproj"

COPY . .
COPY ./Database/ .

WORKDIR "/src"
RUN dotnet build "DatabaseMigrator.csproj" -c Release -o /app/build
Expand All @@ -21,11 +25,11 @@ FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .

ADD entrypoint_DatabaseMigrator.sh /
ADD CompanyName.MyMeetings.Database/Scripts/Migrations /migrations/
ADD ./Database/entrypoint_DatabaseMigrator.sh /
ADD ./Database/CompanyName.MyMeetings.Database/Scripts/Migrations /migrations/

# Copy wait-for-it.sh into our image
COPY wait-for-it.sh wait-for-it.sh
COPY ./Database/wait-for-it.sh wait-for-it.sh
# Make it executable, in Linux
RUN chmod +x wait-for-it.sh

Expand Down
6 changes: 3 additions & 3 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName.EndsWith('API'))">
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" PrivateAssets="All" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" PrivateAssets="All" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" PrivateAssets="All" />
<PackageReference Include="Hellang.Middleware.ProblemDetails" Version="6.5.1" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup Condition="$(MSBuildProjectName.EndsWith('Migrator'))">
<PackageReference Include="dbup-sqlserver" Version="5.0.37" />
Expand Down
4 changes: 3 additions & 1 deletion src/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ COPY ["BuildingBlocks/Infrastructure/CompanyName.MyMeetings.BuildingBlocks.Infra
COPY ["BuildingBlocks/Domain/CompanyName.MyMeetings.BuildingBlocks.Domain.csproj", "BuildingBlocks/Domain/"]
COPY ["BuildingBlocks/Application/CompanyName.MyMeetings.BuildingBlocks.Application.csproj", "BuildingBlocks/Application/"]
COPY ["Modules/UserAccess/Domain/CompanyName.MyMeetings.Modules.UserAccess.Domain.csproj", "Modules/UserAccess/Domain/"]
COPY ["BuildingBlocks/EventBus/CompanyName.MyMeetings.BuildingBlocks.EventBus.csproj", "BuildingBlocks/EventBus/"]
COPY ["Modules/Meetings/IntegrationEvents/CompanyName.MyMeetings.Modules.Meetings.IntegrationEvents.csproj", "Modules/Meetings/IntegrationEvents/"]
COPY ["Modules/Meetings/Application/CompanyName.MyMeetings.Modules.Meetings.Application.csproj", "Modules/Meetings/Application/"]
COPY ["Modules/Meetings/Domain/CompanyName.MyMeetings.Modules.Meetings.Domain.csproj", "Modules/Meetings/Domain/"]
Expand All @@ -28,6 +27,9 @@ COPY ["Modules/Payments/Infrastructure/CompanyName.MyMeetings.Modules.Payments.I
COPY ["Modules/Administration/Application/CompanyName.MyMeetings.Modules.Administration.Application.csproj", "Modules/Administration/Application/"]
COPY ["Modules/Administration/Domain/CompanyName.MyMeetings.Modules.Administration.Domain.csproj", "Modules/Administration/Domain/"]
COPY ["Modules/Administration/Infrastructure/CompanyName.MyMeetings.Modules.Administration.Infrastructure.csproj", "Modules/Administration/Infrastructure/"]
COPY ["Directory.Packages.props", "Directory.Packages.props"]
COPY ["Directory.Build.props", "Directory.Build.props"]
COPY ["Directory.Build.targets", "Directory.Build.targets"]
RUN dotnet restore "API/CompanyName.MyMeetings.API/CompanyName.MyMeetings.API.csproj"
COPY . .
WORKDIR "/src/API/CompanyName.MyMeetings.API"
Expand Down
Loading