Skip to content

Prevent CleanGeneratedDockerfiles from deleting .gitignore #3711

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

Merged
bording merged 1 commit into from
Sep 19, 2023
Merged

Prevent CleanGeneratedDockerfiles from deleting .gitignore #3711

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<PropertyGroup>
<!-- Location used by release CI to push each docker image to docker hub -->
<!-- Location used by release CI to push each docker image to docker hub -->
<DockerfilesFolder>..\..\dockerfiles\</DockerfilesFolder>
</PropertyGroup>

Expand Down Expand Up @@ -75,8 +75,11 @@
</ItemGroup>

<Target Name="CleanGeneratedDockerfiles" AfterTargets="Build">
<RemoveDir Directories="$(DockerfilesFolder)" />
<MakeDir Directories="$(DockerfilesFolder)" />
<ItemGroup>
<Dockerfiles Include="$(DockerfilesFolder)*.dockerfile" />
</ItemGroup>

<Delete Files="@(Dockerfiles)" />
</Target>

<Target Name="ExpandDockerfileTemplates" AfterTargets="CleanGeneratedDockerfiles">
Expand All @@ -91,11 +94,9 @@
<!-- monitoring instance and sidecar dockerfiles -->
<Copy SourceFiles="servicecontrol.transport.monitoring.init-windows.dockerfile-template" DestinationFiles="$(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring.init-windows.dockerfile" />
<Copy SourceFiles="servicecontrol.transport.monitoring-windows.dockerfile-template" DestinationFiles="$(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows.dockerfile" />

</Target>

<Target Name="PrepareDockerBuildContent" AfterTargets="ExpandDockerfileTemplates">

<ItemGroup>
<DeployErrorFiles Include="..\..\deploy\Particular.ServiceControl\**\*.*" Exclude="**\Transports\**" />
<DeployAuditFiles Include="..\..\deploy\Particular.ServiceControl.Audit\**\*.*" Exclude="**\Transports\**" />
Expand All @@ -107,7 +108,6 @@
<Copy SourceFiles="@(DeployAuditFiles)" DestinationFolder="$(OutputPath)\docker\Particular.ServiceControl.Audit\%(RecursiveDir)" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(DeployMonitoringFiles)" DestinationFolder="$(OutputPath)\docker\Particular.ServiceControl.Monitoring\%(RecursiveDir)" SkipUnchangedFiles="true" />
<Copy SourceFiles="@(DeployTransportFiles)" DestinationFolder="$(OutputPath)\docker\Transports\%(RecursiveDir)" SkipUnchangedFiles="true" />

</Target>

<Target Name="BuildDockerImages" AfterTargets="PrepareDockerBuildContent">
Expand All @@ -124,7 +124,6 @@
<Exec Command="docker build -f $(DockerfilesFolder)servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows.dockerfile -t particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).monitoring-windows:$(MinVerVersion) --build-arg TRANSPORT=%(SupportedTransport.TransportName) --build-arg TRANSPORT_CUSTOMIZATION_TYPE=%(SupportedTransport.TransportCustomizationType) $(OutputPath)/docker" />

<!-- Tag as "dev" for easier local testing of containers -->

<Exec Command="docker tag particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).init-windows:$(MinVerVersion) particular/servicecontrol.%(SupportedTransport.DockerfileCustomization).init-windows:dev" />
<Exec Command="docker tag particular/servicecontrol.%(SupportedTransport.DockerfileCustomization)-windows:$(MinVerVersion) particular/servicecontrol.%(SupportedTransport.DockerfileCustomization)-windows:dev" />

Expand Down