Merge branch 'NMSHDB-145-Backbone-Support-Show-sent-and-received-mess…

…ages-of-an-identity' of https://github.com/nmshd/backbone into NMSHDB-145-Backbone-Support-Show-sent-and-received-messages-of-an-identity
nmshd · Jun 25, 2024 · e734527 · e734527
2 parents ba87ad8 + 1c7b278
commit e734527
Show file tree

Hide file tree

Showing 29 changed files with 350 additions and 186 deletions.
diff --git a/.ci/acli/buildContainerImage.js b/.ci/acli/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./Modules/Devices/src/Devices.AdminCli/Dockerfile --tag ghcr.io/nmshd/backbone-admin-cli:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./Modules/Devices/src/Devices.AdminCli/Dockerfile --tag ghcr.io/nmshd/backbone-admin-cli:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/aui/buildContainerImage.js b/.ci/aui/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./AdminApi/src/AdminApi/Dockerfile --tag ghcr.io/nmshd/backbone-admin-ui:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./AdminApi/src/AdminApi/Dockerfile --tag ghcr.io/nmshd/backbone-admin-ui:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/capi/buildContainerImage.js b/.ci/capi/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./ConsumerApi/Dockerfile --tag ghcr.io/nmshd/backbone-consumer-api:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./ConsumerApi/Dockerfile --tag ghcr.io/nmshd/backbone-consumer-api:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/dbm/buildContainerImage.js b/.ci/dbm/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./DatabaseMigrator/Dockerfile --tag ghcr.io/nmshd/backbone-database-migrator:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./DatabaseMigrator/Dockerfile --tag ghcr.io/nmshd/backbone-database-migrator:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/docker-compose.test.postgres.yml b/.ci/docker-compose.test.postgres.yml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   ### infrastructure ###
 

diff --git a/.ci/docker-compose.test.sqlserver.yml b/.ci/docker-compose.test.sqlserver.yml
@@ -1,4 +1,3 @@
-version: "3.3"
 services:
   ### infrastructure ###
 

diff --git a/.ci/docker-compose.test.yml b/.ci/docker-compose.test.yml
@@ -1,11 +1,8 @@
-version: "3.3"
 services:
   consumer-api:
     container_name: consumer-api-test
     hostname: consumer-api
-    build:
-      context: ..
-      dockerfile: ConsumerApi/Dockerfile
+    image: consumer-api:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
@@ -24,9 +21,7 @@ services:
   admin-ui:
     container_name: admin-ui-test
     hostname: admin-ui
-    build:
-      context: ..
-      dockerfile: AdminApi/src/AdminApi/Dockerfile
+    image: admin-ui:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     ports:
@@ -42,9 +37,7 @@ services:
 
   event-handler-service:
     container_name: event-handler-service-test
-    build:
-      context: ..
-      dockerfile: EventHandlerService/src/EventHandlerService/Dockerfile
+    image: event-handler-service:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     depends_on:
@@ -58,9 +51,7 @@ services:
 
   sse-server:
     container_name: sse-server-test
-    build:
-      context: ..
-      dockerfile: SseServer/src/SseServer/Dockerfile
+    image: sse-server:0.0.1
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
     configs:
@@ -69,9 +60,7 @@ services:
 
   database-migrator:
     container_name: database-migrator-test
-    build:
-      context: ..
-      dockerfile: DatabaseMigrator/Dockerfile
+    image: database-migrator:0.0.1
     depends_on:
       seed-database:
         condition: service_completed_successfully
@@ -109,9 +98,7 @@ services:
 
   seed-client:
     container_name: seed-client-test
-    build:
-      context: ..
-      dockerfile: Modules/Devices/src/Devices.AdminCli/Dockerfile
+    image: seed-client:0.0.1
     depends_on:
       consumer-api:
         condition: service_healthy

diff --git a/.ci/eh/buildContainerImage.js b/.ci/eh/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./EventHandlerService/src/EventHandlerService/Dockerfile --tag ghcr.io/nmshd/backbone-event-handler:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./EventHandlerService/src/EventHandlerService/Dockerfile --tag ghcr.io/nmshd/backbone-event-handler:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/fsc/buildContainerImage.js b/.ci/fsc/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./Modules/Files/src/Files.Jobs.SanityCheck/Dockerfile --tag ghcr.io/nmshd/backbone-files-sanity-check:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./Modules/Files/src/Files.Jobs.SanityCheck/Dockerfile --tag ghcr.io/nmshd/backbone-files-sanity-check:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/idj/buildContainerImage.js b/.ci/idj/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./Jobs/src/Job.IdentityDeletion/Dockerfile --tag ghcr.io/nmshd/backbone-identity-deletion-jobs:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./Jobs/src/Job.IdentityDeletion/Dockerfile --tag ghcr.io/nmshd/backbone-identity-deletion-jobs:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
diff --git a/.ci/integrationTest.postgres.sh b/.ci/integrationTest.postgres.sh
@@ -5,11 +5,17 @@ dockerCompose() {
     docker compose -f ./.ci/docker-compose.test.yml -f ./.ci/docker-compose.test.postgres.yml "$@"
 }
 
-dockerCompose down
-dockerCompose build
-dockerCompose up -d
-dotnet restore "Backbone.sln"
-dotnet build --no-restore "Backbone.sln"
+{
+  dockerCompose down;
+  dockerCompose up -d --no-build
+} &
+{
+  dotnet restore "Backbone.sln";
+  dotnet build --no-restore "Backbone.sln"
+}
+wait
+
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
+
 dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"
diff --git a/.ci/integrationTest.sqlserver.sh b/.ci/integrationTest.sqlserver.sh
@@ -5,11 +5,17 @@ dockerCompose() {
     docker compose -f ./.ci/docker-compose.test.yml -f ./.ci/docker-compose.test.sqlserver.yml "$@"
 }
 
-dockerCompose down
-dockerCompose build
-dockerCompose up -d
-dotnet restore "Backbone.sln"
-dotnet build --no-restore "Backbone.sln"
+{
+  dockerCompose down;
+  dockerCompose up -d --no-build
+} &
+{
+  dotnet restore "Backbone.sln";
+  dotnet build --no-restore "Backbone.sln"
+}
+wait
+
 export CONSUMER_API_BASE_ADDRESS="http://localhost:5000"
 export ADMIN_API_BASE_ADDRESS="http://localhost:5173"
+
 dotnet test --no-restore --no-build --filter "Category=Integration&TestCategory!~ignore" --logger "GitHubActions;summary.includeNotFoundTests=false" "Backbone.sln"
diff --git a/.ci/loadDockerImages.sh b/.ci/loadDockerImages.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+for f in /tmp/*.tar; do
+    docker load --input $f
+done
diff --git a/.ci/sc/buildContainerImage.js b/.ci/sc/buildContainerImage.js
@@ -9,4 +9,4 @@ const projectSuffix = $.env["PROJECT_SUFFIX"] ? `.${$.env["PROJECT_SUFFIX"]}` :
 
 const moduleNameCamelCase = toCamelCase(moduleName);
 
-await $`docker build --file ./Modules/${moduleName}/src/${moduleName}.Jobs.SanityCheck${projectSuffix}/Dockerfile --tag ghcr.io/nmshd/backbone-${moduleNameCamelCase}-sanity-check:${tag} .`;
+await $`docker build --file ./Modules/${moduleName}/src/${moduleName}.Jobs.SanityCheck${projectSuffix}/Dockerfile --tag ghcr.io/nmshd/backbone-${moduleNameCamelCase}-sanity-check:${tag} --build-arg VERSION=${tag} .`;
diff --git a/.ci/sses/buildContainerImage.js b/.ci/sses/buildContainerImage.js
@@ -8,4 +8,4 @@ const tag = getRequiredEnvVar("TAG");
 const platforms = process.env.PLATFORMS ?? "linux/amd64,linux/arm64";
 const push = process.env.PUSH === "1" ? ["--push", "--provenance=true", "--sbom=true"] : "";
 
-await $`docker buildx build --file ./SseServer/src/SseServer/Dockerfile --tag ghcr.io/nmshd/backbone-sse-server:${tag} --platform ${platforms} ${push} .`;
+await $`docker buildx build --file ./SseServer/src/SseServer/Dockerfile --tag ghcr.io/nmshd/backbone-sse-server:${tag} --platform ${platforms} --build-arg VERSION=${tag} ${push} .`;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,4 +9,4 @@ const projectSuffix = $.env["PROJECT_SUFFIX"] ? `.${$.env["PROJECT_SUFFIX"]}` :

		const moduleNameCamelCase = toCamelCase(moduleName);

		await $`docker build --file ./Modules/${moduleName}/src/${moduleName}.Jobs.SanityCheck${projectSuffix}/Dockerfile --tag ghcr.io/nmshd/backbone-${moduleNameCamelCase}-sanity-check:${tag} .`;
		await $`docker build --file ./Modules/${moduleName}/src/${moduleName}.Jobs.SanityCheck${projectSuffix}/Dockerfile --tag ghcr.io/nmshd/backbone-${moduleNameCamelCase}-sanity-check:${tag} --build-arg VERSION=${tag} .`;