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

fix: OR-2009 update build.fsx with updated containerize #582

Merged
merged 3 commits into from
Dec 11, 2023
Merged

fix: OR-2009 update build.fsx with updated containerize #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4fc78e
fix: OR-2009 update build.fsx with updated containerize
Dec 11, 2023
2b2baac
fix: OR-2009 open System(.io)
koenmetsu Dec 11, 2023
015e8cb
fix: OR-2009 replace magda test data
koenmetsu Dec 11, 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
62 changes: 49 additions & 13 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ open Fake.IO.FileSystemOperators
open Fake.DotNet
open ``Build-generic``

open System
open System.IO


let product = "Basisregisters Vlaanderen"
let copyright = "Copyright (c) Vlaamse overheid"
let company = "Vlaamse overheid"

let dockerRepository = "association-registry"
let assemblyVersionNumber = (sprintf "%s.0")
let nugetVersionNumber = (sprintf "%s")

Expand All @@ -27,8 +30,41 @@ let setVersions = (setSolutionVersions assemblyVersionNumber product copyright c
let test = testSolution
let publishSource = publish assemblyVersionNumber
let pack = pack nugetVersionNumber
let containerize = containerize dockerRepository
let push = push dockerRepository

let containerize project containerName =
let result1 =
[ "build"; "."; "--no-cache"; "--tag"; sprintf "%s/%s:%s" dockerRegistry containerName buildNumber; "--build-arg"; sprintf "build_number=%s" buildNumber]
|> CreateProcess.fromRawCommand "docker"
|> CreateProcess.withWorkingDirectory (buildDir @@ project @@ "linux")
|> CreateProcess.withTimeout (TimeSpan.FromMinutes 5.)
|> Proc.run

if result1.ExitCode <> 0 then failwith "Failed result from Docker Build"

let result2 =
[ "tag"; sprintf "%s/%s:%s" dockerRegistry containerName buildNumber; sprintf "%s/%s:latest" dockerRegistry containerName]
|> CreateProcess.fromRawCommand "docker"
|> CreateProcess.withTimeout (TimeSpan.FromMinutes 5.)
|> Proc.run

if result2.ExitCode <> 0 then failwith "Failed result from Docker Tag"

let push containerName =
let result1 =
[ "push"; sprintf "%s/%s:%s" dockerRegistry containerName buildNumber]
|> CreateProcess.fromRawCommand "docker"
|> CreateProcess.withTimeout (TimeSpan.FromMinutes 5.)
|> Proc.run

if result1.ExitCode <> 0 then failwith "Failed result from Docker Push"

let result2 =
[ "push"; sprintf "%s/%s:latest" dockerRegistry containerName]
|> CreateProcess.fromRawCommand "docker"
|> CreateProcess.withTimeout (TimeSpan.FromMinutes 5.)
|> Proc.run

if result2.ExitCode <> 0 then failwith "Failed result from Docker Push Latest"

supportedRuntimeIdentifiers <- [ "msil"; "linux-x64" ]

Expand Down Expand Up @@ -67,20 +103,20 @@ Target.create "Publish_Solution" (fun _ ->
"AssociationRegistry.Admin.ProjectionHost"
] |> List.iter publishSource)

Target.create "Containerize_AcmApi" (fun _ -> containerize "AssociationRegistry.Acm.Api" "acm-api")
Target.create "PushContainer_AcmApi" (fun _ -> push "acm-api")
Target.create "Containerize_AcmApi" (fun _ -> containerize "AssociationRegistry.Acm.Api" "verenigingsregister-acmapi")
Target.create "PushContainer_AcmApi" (fun _ -> push "verenigingsregister-acmapi")

Target.create "Containerize_PublicApi" (fun _ -> containerize "AssociationRegistry.Public.Api" "public-api")
Target.create "PushContainer_PublicApi" (fun _ -> push "public-api")
Target.create "Containerize_PublicApi" (fun _ -> containerize "AssociationRegistry.Public.Api" "verenigingsregister-publicapi")
Target.create "PushContainer_PublicApi" (fun _ -> push "verenigingsregister-publicapi")

Target.create "Containerize_PublicProjections" (fun _ -> containerize "AssociationRegistry.Public.ProjectionHost" "public-projections")
Target.create "PushContainer_PublicProjections" (fun _ -> push "public-projections")
Target.create "Containerize_PublicProjections" (fun _ -> containerize "AssociationRegistry.Public.ProjectionHost" "verenigingsregister-publicprojections")
Target.create "PushContainer_PublicProjections" (fun _ -> push "verenigingsregister-publicprojections")

Target.create "Containerize_AdminApi" (fun _ -> containerize "AssociationRegistry.Admin.Api" "admin-api")
Target.create "PushContainer_AdminApi" (fun _ -> push "admin-api")
Target.create "Containerize_AdminApi" (fun _ -> containerize "AssociationRegistry.Admin.Api" "verenigingsregister-adminapi")
Target.create "PushContainer_AdminApi" (fun _ -> push "verenigingsregister-adminapi")

Target.create "Containerize_AdminProjections" (fun _ -> containerize "AssociationRegistry.Admin.ProjectionHost" "admin-projections")
Target.create "PushContainer_AdminProjections" (fun _ -> push "admin-projections")
Target.create "Containerize_AdminProjections" (fun _ -> containerize "AssociationRegistry.Admin.ProjectionHost" "verenigingsregister-adminprojections")
Target.create "PushContainer_AdminProjections" (fun _ -> push "verenigingsregister-adminprojections")

// --------------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions ....Test.Admin.Api/Magda/MagdaFacade/When_Calling_GeefOnderneming/Given_A_Valid_KboNummer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ public async Task Then_It_Returns_GeefOndernemingResponseBody(MagdaOptionsSectio
onderneming?.Namen.MaatschappelijkeNamen.Should().ContainEquivalentOf(
new NaamOndernemingType
{
Naam = "Kom op tegen Kanker",
Naam = "Vlaamse Liga tegen Kanker",
Taalcode = "nl",
DatumBegin = "2015-10-13",
DatumBegin = "1998-01-01",
DatumEinde = null,
});

Expand Down
2 changes: 1 addition & 1 deletion ...nlijkheid/With_Kbo_Nummer_For_Supported_Rechtsvorm/With_KboNummer_For_PrivateStichting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void Then_it_saves_the_events()
.Should().ContainSingle(e => e.KboNummer == RegistreerVerenigingMetRechtspersoonlijkheidSetup.UitKboRequest.KboNummer).Subject;
using (new AssertionScope())
{
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Kom op tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Vlaamse Liga tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.KorteNaam.Should().Be("V.L.K.");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Startdatum.Should().Be(new DateOnly(1989, 10, 03));

Expand Down
2 changes: 1 addition & 1 deletion ...id/With_Kbo_Nummer_For_Supported_Rechtsvorm/With_KboNummer_For_StichtingVanOpenbaarNut.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void Then_it_saves_the_events()

using (new AssertionScope())
{
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Kom op tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Vlaamse Liga tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.KorteNaam.Should().Be("V.L.K.");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Startdatum.Should().Be(new DateOnly(year: 1989, month: 10, day: 03));
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Rechtsvorm.Should().Be(Verenigingstype.StichtingVanOpenbaarNut.Code);
Expand Down
2 changes: 1 addition & 1 deletion ...tRechtspersoonlijkheid/With_Kbo_Nummer_For_Supported_Rechtsvorm/With_KboNummer_For_Vzw.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void Then_it_saves_the_events()

using (new AssertionScope())
{
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Kom op tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Naam.Should().Be("Vlaamse Liga tegen Kanker");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.KorteNaam.Should().Be("V.L.K.");
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Startdatum.Should().Be(new DateOnly(year: 1989, month: 10, day: 03));
verenigingMetRechtspersoonlijkheidWerdGeregistreerd.Rechtsvorm.Should().Be(Verenigingstype.VZW.Code);
Expand Down
6 changes: 3 additions & 3 deletions wiremock/__files/GeefOndernemingResponses/0442528054.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
<Namen
xmlns:web="http://webservice.geefondernemingdienst-02_00.onderneming-02_00.vip.vlaanderen.be">
<MaatschappelijkeNamen>
<MaatschappelijkeNaam DatumBegin="2015-10-13">
<Naam>Kom op tegen Kanker</Naam>
<MaatschappelijkeNaam DatumBegin="1998-01-01">
<Naam>Vlaamse Liga tegen Kanker</Naam>
<Taalcode>nl</Taalcode>
</MaatschappelijkeNaam>
</MaatschappelijkeNamen>
<AfgekorteNamen>
<AfgekorteNaam DatumBegin="2015-10-13">
<AfgekorteNaam DatumBegin="1998-01-01">
<Naam>V.L.K.</Naam>
<Taalcode>nl</Taalcode>
</AfgekorteNaam>
Expand Down
6 changes: 3 additions & 3 deletions wiremock/__files/GeefOndernemingResponses/0468831484.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
<Namen
xmlns:web="http://webservice.geefondernemingdienst-02_00.onderneming-02_00.vip.vlaanderen.be">
<MaatschappelijkeNamen>
<MaatschappelijkeNaam DatumBegin="2015-10-13">
<Naam>Kom op tegen Kanker</Naam>
<MaatschappelijkeNaam DatumBegin="1998-01-01">
<Naam>Vlaamse Liga tegen Kanker</Naam>
<Taalcode>nl</Taalcode>
</MaatschappelijkeNaam>
</MaatschappelijkeNamen>
<AfgekorteNamen>
<AfgekorteNaam DatumBegin="2015-10-13">
<AfgekorteNaam DatumBegin="1998-01-01">
<Naam>V.L.K.</Naam>
<Taalcode>nl</Taalcode>
</AfgekorteNaam>
Expand Down
6 changes: 3 additions & 3 deletions wiremock/__files/GeefOndernemingResponses/0546572531.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
<Namen
xmlns:web="http://webservice.geefondernemingdienst-02_00.onderneming-02_00.vip.vlaanderen.be">
<MaatschappelijkeNamen>
<MaatschappelijkeNaam DatumBegin="2015-10-13">
<Naam>Kom op tegen Kanker</Naam>
<MaatschappelijkeNaam DatumBegin="1998-01-01">
<Naam>Vlaamse Liga tegen Kanker</Naam>
<Taalcode>nl</Taalcode>
</MaatschappelijkeNaam>
</MaatschappelijkeNamen>
<AfgekorteNamen>
<AfgekorteNaam DatumBegin="2015-10-13">
<AfgekorteNaam DatumBegin="1998-01-01">
<Naam>V.L.K.</Naam>
<Taalcode>nl</Taalcode>
</AfgekorteNaam>
Expand Down
6 changes: 3 additions & 3 deletions wiremock/__files/GeefOndernemingResponses/0554790609.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
<Namen
xmlns:web="http://webservice.geefondernemingdienst-02_00.onderneming-02_00.vip.vlaanderen.be">
<MaatschappelijkeNamen>
<MaatschappelijkeNaam DatumBegin="2015-10-13">
<Naam>Kom op tegen Kanker</Naam>
<MaatschappelijkeNaam DatumBegin="1998-01-01">
<Naam>Vlaamse Liga tegen Kanker</Naam>
<Taalcode>nl</Taalcode>
</MaatschappelijkeNaam>
</MaatschappelijkeNamen>
<AfgekorteNamen>
<AfgekorteNaam DatumBegin="2015-10-13">
<AfgekorteNaam DatumBegin="1998-01-01">
<Naam>V.L.K.</Naam>
<Taalcode>nl</Taalcode>
</AfgekorteNaam>
Expand Down
Loading