Skip to content

Commit b51a730

Browse files
authored
Remove unsupported container infrastructure from 4.x release branch (#4207)
1 parent 1137817 commit b51a730

10 files changed

+1
-311
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ jobs:
7373
env:
7474
AZURE_KEY_VAULT_CLIENT_SECRET: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
7575
run: dotnet build src/Setup --configuration Release
76-
- name: Build Docker images
77-
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
78-
run: dotnet build src/ServiceControl.DockerImages --configuration Release
79-
- name: List Docker images
80-
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
81-
shell: pwsh
82-
run: docker images
8376
- name: Publish assets
8477
uses: actions/[email protected]
8578
with:
@@ -126,41 +119,9 @@ jobs:
126119
Write-Host Zips: Expected $expectedZipCount but found $zipCount
127120
exit -1
128121
}
129-
- name: Prepare ServiceControl metadata
130-
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
131-
shell: pwsh
132-
run: |
133-
#List of Docker image names used to control re-tagging during push to production
134-
$dockerImageNames = Get-ChildItem -Path dockerfiles -Filter *.dockerfile |
135-
Select-Object -Property @{label = 'Name'; expression = {[System.IO.Path]::GetFileNameWithoutExtension($_.FullName)} } |
136-
Select-object -ExpandProperty Name
137-
138-
$serviceControlMetadata = @{
139-
DockerImageNames = $dockerImageNames
140-
}
141-
142-
$serviceControlMetadata | ConvertTo-Json | Out-File -Path ServiceControlMetadata.json
143122
- name: Deploy
144123
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
145124
# Does not follow standard practice of targeting explicit versions because configuration is tightly coupled to Octopus Deploy configuration
146125
uses: Particular/push-octopus-package-action@main
147126
with:
148127
octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}
149-
additional-metadata-paths: ServiceControlMetadata.json
150-
- name: Login to Docker Hub
151-
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
152-
uses: docker/[email protected]
153-
with:
154-
username: ${{ secrets.DOCKERHUB_USERNAME }}
155-
password: ${{ secrets.DOCKERHUB_TOKEN }}
156-
- name: Push Docker images
157-
if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
158-
shell: pwsh
159-
run: |
160-
Get-ChildItem -Path dockerfiles -Filter *.dockerfile | ForEach-Object {
161-
$dockerImageName = $_.Name.SubString(0, $_.Name.Length - ".dockerfile".Length);
162-
163-
$dockerpushcmd = "docker push particular/" + $dockerImageName +":${{ env.MinVerVersion }}"
164-
echo "Docker Push Command: $dockerpushcmd"
165-
Invoke-Expression $dockerpushcmd.ToLower()
166-
}

src/ServiceControl.DockerImages/README.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/ServiceControl.DockerImages/ServiceControl.DockerImages.csproj

Lines changed: 0 additions & 109 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport-windows.dockerfile-template

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport.audit-windows.dockerfile-template

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport.audit.init-windows.dockerfile-template

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport.init-windows.dockerfile-template

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport.monitoring-windows.dockerfile-template

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/ServiceControl.DockerImages/servicecontrol.transport.monitoring.init-windows.dockerfile-template

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/ServiceControl.sln

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Audit.Persis
142142
EndProject
143143
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Audit.Persistence.SagaAudit", "ServiceControl.Audit.Persistence.SagaAudit\ServiceControl.Audit.Persistence.SagaAudit.csproj", "{CD8495ED-3C98-41FC-8643-61B35B50C413}"
144144
EndProject
145-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.DockerImages", "ServiceControl.DockerImages\ServiceControl.DockerImages.csproj", "{1C648E04-F9E3-433F-86D9-E99344275613}"
146-
EndProject
147145
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Management.PowerShell", "ServiceControl.Management.PowerShell\ServiceControl.Management.PowerShell.csproj", "{31CF8050-9A87-4569-A750-3171B2A892C0}"
148146
EndProject
149147
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Transports.Tests", "ServiceControl.Transports.Tests\ServiceControl.Transports.Tests.csproj", "{03074EEB-1851-4C55-BDB9-E5F527DF2FF6}"
@@ -180,7 +178,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestHelper", "TestHelper\Te
180178
EndProject
181179
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Infrastructure", "ServiceControl.Infrastructure\ServiceControl.Infrastructure.csproj", "{F488851D-C635-49C9-8CD7-E9B90C756565}"
182180
EndProject
183-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceControl.Infrastructure.Tests", "ServiceControl.Infrastructure.Tests\ServiceControl.Infrastructure.Tests.csproj", "{80008096-F1F9-43C3-8CE6-E79A68F8676E}"
181+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceControl.Infrastructure.Tests", "ServiceControl.Infrastructure.Tests\ServiceControl.Infrastructure.Tests.csproj", "{80008096-F1F9-43C3-8CE6-E79A68F8676E}"
184182
EndProject
185183
Global
186184
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -390,8 +388,6 @@ Global
390388
{CD8495ED-3C98-41FC-8643-61B35B50C413}.Debug|Any CPU.Build.0 = Debug|Any CPU
391389
{CD8495ED-3C98-41FC-8643-61B35B50C413}.Release|Any CPU.ActiveCfg = Release|Any CPU
392390
{CD8495ED-3C98-41FC-8643-61B35B50C413}.Release|Any CPU.Build.0 = Release|Any CPU
393-
{1C648E04-F9E3-433F-86D9-E99344275613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
394-
{1C648E04-F9E3-433F-86D9-E99344275613}.Release|Any CPU.ActiveCfg = Release|Any CPU
395391
{31CF8050-9A87-4569-A750-3171B2A892C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
396392
{31CF8050-9A87-4569-A750-3171B2A892C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
397393
{31CF8050-9A87-4569-A750-3171B2A892C0}.Release|Any CPU.ActiveCfg = Release|Any CPU

0 commit comments

Comments
 (0)