[ADMINAPI-1318] - Adding the build and push of an image for arm processors (#375)

jpardogrowthaccelerationpartners · jagudelo-gap · web-flow · commit 50befcd3e0c2 · 2025-11-18T09:57:48.000-06:00
* Enhance Docker build process by adding QEMU setup and specifying target platforms

* Update base image and dependencies in Dockerfile for improved compatibility

* Fix base image version in Dockerfile to ensure compatibility

* Fix string quotes in coverage arguments for consistency in RunTests function

* Revert $coverageArgs

* Refactor RunTests function to streamline coverage argument handling

* Replace wget with curl for health check in ods_inspect.sh for improved reliability

* Update OdsApi version

---------

Co-authored-by: Juan Agudelo &lt;jagudelo@growthaccelerationpartners.com&gt;
diff --git a/.github/workflows/api-e2e-mssql-multitenant.yml b/.github/workflows/api-e2e-mssql-multitenant.yml
@@ -65,11 +65,6 @@ jobs:
           chmod +x './E2E Tests/V2/gh-action-setup/admin_inspect.sh'
           './E2E Tests/V2/gh-action-setup/admin_inspect.sh' adminapi
 
-      - name: Verify Ods containers are running
-        run: |
-          chmod +x './E2E Tests/V2/gh-action-setup/ods_inspect.sh'
-          './E2E Tests/V2/gh-action-setup/ods_inspect.sh' ed-fi-ods-api
-
       - name: Setup node
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
diff --git a/.github/workflows/api-e2e-mssql-singletenant.yml b/.github/workflows/api-e2e-mssql-singletenant.yml
@@ -65,11 +65,6 @@ jobs:
           chmod +x './E2E Tests/V2/gh-action-setup/admin_inspect.sh'
           './E2E Tests/V2/gh-action-setup/admin_inspect.sh' adminapi
 
-      - name: Verify Ods containers are running
-        run: |
-          chmod +x './E2E Tests/V2/gh-action-setup/ods_inspect.sh'
-          './E2E Tests/V2/gh-action-setup/ods_inspect.sh' ed-fi-ods-api
-
       - name: Setup node
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
diff --git a/.github/workflows/api-e2e-pgsql-multitenant.yml b/.github/workflows/api-e2e-pgsql-multitenant.yml
@@ -65,11 +65,6 @@ jobs:
           chmod +x './E2E Tests/V2/gh-action-setup/admin_inspect.sh'
           './E2E Tests/V2/gh-action-setup/admin_inspect.sh' adminapi
 
-      - name: Verify Ods containers are running
-        run: |
-          chmod +x './E2E Tests/V2/gh-action-setup/ods_inspect.sh'
-          './E2E Tests/V2/gh-action-setup/ods_inspect.sh' ed-fi-ods-api
-
       - name: Setup node
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
diff --git a/.github/workflows/api-e2e-pgsql-singletenant.yml b/.github/workflows/api-e2e-pgsql-singletenant.yml
@@ -61,11 +61,6 @@ jobs:
           chmod +x './E2E Tests/V2/gh-action-setup/admin_inspect.sh'
           './E2E Tests/V2/gh-action-setup/admin_inspect.sh' adminapi
 
-      - name: Verify Ods containers are running
-        run: |
-          chmod +x './E2E Tests/V2/gh-action-setup/ods_inspect.sh'
-          './E2E Tests/V2/gh-action-setup/ods_inspect.sh' ed-fi-ods-api
-
       - name: Setup node
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
         with:
diff --git a/.github/workflows/on-prerelease.yml b/.github/workflows/on-prerelease.yml
@@ -345,15 +345,18 @@ jobs:
           echo "DBTAGS=$DBTAGS" >> $GITHUB_OUTPUT
           echo "VERSION=$SEMVERSION" >> $GITHUB_OUTPUT
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5  # v3.8.0
-
       - name: Log in to Docker Hub
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567  # v3.3.0
         with:
           username: ${{ env.DOCKER_USERNAME }}
           password: ${{ env.DOCKER_HUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5  # v3.8.0
+
       - name: Extract metadata (tags, labels) for admin api image
         id: metaapi
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96  # v5.6.1
@@ -366,6 +369,7 @@ jobs:
           context: "{{defaultContext}}:Docker"
           cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:pre
           cache-to: type=inline
+          platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION=${{ steps.prepare-tags.outputs.VERSION }}
             ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }}
diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_api_idp_mssql.env b/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_api_idp_mssql.env
@@ -44,6 +44,6 @@ KEYCLOAK_ADMIN_CONSOLE_REALM=edfi-admin-console
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_api_idp_pgsql.env b/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_api_idp_pgsql.env
@@ -44,6 +44,6 @@ KEYCLOAK_ADMIN_CONSOLE_REALM=edfi-admin-console
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_mssql.env b/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_mssql.env
@@ -28,6 +28,6 @@ ADMIN_API_HEALTHCHECK_TEST="wget -nv -t1 --spider http://${ADMIN_API_VIRTUAL_NAM
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_pgsql.env b/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/.automation_pgsql.env
@@ -26,6 +26,6 @@ ADMIN_API_HEALTHCHECK_TEST="wget -nv -t1 --spider http://${ADMIN_API_VIRTUAL_NAM
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=6VDn8N4Kj7vYAmnMrFUgdXTqOaTiGZJc9Kf2TFFDHAA=
diff --git a/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/ods_inspect.sh b/Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/ods_inspect.sh
@@ -17,8 +17,7 @@ else
     exit 1
 fi
 
-status=`wget -nv -t1 --spider -S https://localhost/api/health --no-check-certificate 2>&1|grep "HTTP/"|awk '{print $2}'`
-
+status=`curl -s -o /dev/null -w "%{http_code}" -k https://localhost/api/health`
 if [[ $status -eq "200" ]]
 then
     echo "--- Ods API application is running ---"
diff --git a/Docker/V2/Compose/mssql/MultiTenant/compose-build-ods-multi-tenant.yml b/Docker/V2/Compose/mssql/MultiTenant/compose-build-ods-multi-tenant.yml
@@ -9,9 +9,9 @@ services:
       context: ../../../../Settings/V2/DB-Ods/mssql/
       dockerfile: Dockerfile
       args:
-        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.1.776}
-        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.1.609}
-        STANDARD_VERSION: ${STANDARD_VERSION:-5.0.0}
+        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.3.478}
+        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.3.326}
+        STANDARD_VERSION: ${STANDARD_VERSION:-5.2.0}
         EXTENSION_VERSION: ${EXTENSION_VERSION:-1.1.0}
     environment:
       ACCEPT_EULA: "Y"
@@ -35,9 +35,9 @@ services:
       context: ../../../../Settings/V2/DB-Ods/mssql/
       dockerfile: Dockerfile
       args:
-        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.1.776}
-        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.1.609}
-        STANDARD_VERSION: ${STANDARD_VERSION:-5.0.0}
+        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.3.478}
+        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.3.326}
+        STANDARD_VERSION: ${STANDARD_VERSION:-5.2.0}
         EXTENSION_VERSION: ${EXTENSION_VERSION:-1.1.0}
     environment:
       ACCEPT_EULA: "Y"
@@ -97,4 +97,4 @@ volumes:
     name: vol-nuget-db-ods-tenant1-local
   vol-db-ods-tenant2:
     driver: local
-    name: vol-nuget-db-ods-tenant2-local
+    name: vol-nuget-db-ods-tenant2-local
diff --git a/Docker/V2/Compose/mssql/SingleTenant/compose-build-ods.yml b/Docker/V2/Compose/mssql/SingleTenant/compose-build-ods.yml
@@ -9,9 +9,9 @@ services:
       context: ../../../../Settings/V2/DB-Ods/mssql/
       dockerfile: Dockerfile
       args:
-        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.1.776}
-        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.1.609}
-        STANDARD_VERSION: ${STANDARD_VERSION:-5.0.0}
+        ODS_VERSION: ${MSSQL_ODS_MINIMAL_VERSION:-7.3.478}
+        TPDM_VERSION: ${MSSQL_TPDM_MINIMAL_VERSION:-7.3.326}
+        STANDARD_VERSION: ${STANDARD_VERSION:-5.2.0}
         EXTENSION_VERSION: ${EXTENSION_VERSION:-1.1.0}
     environment:
       ACCEPT_EULA: "Y"
@@ -60,4 +60,4 @@ services:
 volumes:
   vol-db-ods:
     driver: local
-    name: vol-nuget-db-ods-local
+    name: vol-nuget-db-ods-local
diff --git a/Docker/V2/Compose/mssql/env-idp.example b/Docker/V2/Compose/mssql/env-idp.example
@@ -61,6 +61,6 @@ KEYCLOAK_ADMIN_CONSOLE_REALM=edfi-admin-console
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
diff --git a/Docker/V2/Compose/mssql/env.example b/Docker/V2/Compose/mssql/env.example
@@ -53,6 +53,6 @@ KEYCLOAK_ADMIN_CONSOLE_REALM=edfi-admin-console
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
-ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
+ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
diff --git a/Docker/V2/Compose/pgsql/env-idp.example b/Docker/V2/Compose/pgsql/env-idp.example
@@ -68,6 +68,6 @@ OIDC_ENABLE_SERVER_CERTIFICATE=true
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
 ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
diff --git a/Docker/V2/Compose/pgsql/env.example b/Docker/V2/Compose/pgsql/env.example
@@ -42,6 +42,6 @@ ADMIN_API_HEALTHCHECK_TEST="wget -nv -t1 --spider http://${ADMIN_API_VIRTUAL_NAM
 
 
 # Ods Api
-TAG=7.1
+TAG=7.3
 API_HEALTHCHECK_TEST="curl -f http://localhost/health"
 ODS_CONNECTION_STRING_ENCRYPTION_KEY=<Create a new string as symmetric encryption key>
diff --git a/Docker/api.pgsql.Dockerfile b/Docker/api.pgsql.Dockerfile
@@ -4,9 +4,9 @@
 # See the LICENSE and NOTICES files in the project root for more information.
 
 #tag 8.0-alpine
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.21-alpine3.21-amd64@sha256:61adf767314cc4b6a298dd3bdba46a2f10be37d67c75ad64dc7a89a44df8a228 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.21-alpine3.22@sha256:cb69be896f82e0d73f513c128ece501c7c1f1809c49415a69dc096e013d5314a AS base
 RUN apk upgrade --no-cache && \
-    apk add --no-cache bash=~5 dos2unix=~7 gettext=~0 icu=~74 jq=~1 musl=~1.2.5-r9 openssl=3.3.5-r0 postgresql15-client=~15 unzip=~6 && \
+    apk add --no-cache bash=~5 dos2unix=~7 gettext=~0 icu=~76.1-r1 jq=~1 musl=~1.2.5-r10 openssl=3.5.4-r0 postgresql15-client=~15 unzip=~6 && \
     rm -rf /var/cache/apk/* && \
     addgroup -S edfi && adduser -S edfi -G edfi
 
diff --git a/build.ps1 b/build.ps1
@@ -283,17 +283,14 @@ function RunTests {
     $testAssemblies | ForEach-Object {
         Write-Output "Executing: dotnet test $($_)"
         Invoke-Execute {
-
-            $coverageArgs = ""
-
-            if ($script:RunCoverageAnalysis) {
-                $coverageArgs = "--collect:""XPlat Code Coverage"""
+            if ($script:RunCoverageAnalysis)
+            {
+                & dotnet test $_ --collect 'XPlat Code Coverage' --logger "trx;LogFileName=$($_).trx" --nologo
+            }
+            else
+            {
+                & dotnet test $_ --logger "trx;LogFileName=$($_).trx" --nologo
             }
-
-            dotnet test $_ `
-                $coverageArgs `
-                --logger "trx;LogFileName=$($_).trx" `
-                --nologo
         }
     }
 }
