[ADMINAPI-1323] - Docker updates - Publish appropriate Admin DB images

.github/workflows/api-e2e-mssql-multitenant.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           docker compose \
             -f '../../Docker/V2/Compose/mssql/MultiTenant/compose-build-dev-multi-tenant.yml' \
-            -f '../../Docker/V2/Compose/mssql/MultiTenant/compose-build-ods-multi-tenant.yml' \
             --env-file './E2E Tests/V2/gh-action-setup/.automation_mssql.env' \
             up -d
 

.github/workflows/api-e2e-mssql-singletenant.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           docker compose \
             -f '../../Docker/V2/Compose/mssql/SingleTenant/compose-build-dev.yml' \
-            -f '../../Docker/V2/Compose/mssql/SingleTenant/compose-build-ods.yml' \
             --env-file './E2E Tests/V2/gh-action-setup/.automation_mssql.env' \
             up -d
 

.github/workflows/api-e2e-pgsql-multitenant.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           docker compose \
             -f '../../Docker/V2/Compose/pgsql/MultiTenant/compose-build-dev-multi-tenant.yml' \
-            -f '../../Docker/V2/Compose/pgsql/MultiTenant/compose-build-ods-multi-tenant.yml' \
             --env-file './E2E Tests/V2/gh-action-setup/.automation_pgsql.env' \
             up -d
 

.github/workflows/api-e2e-pgsql-singletenant.yml

@@ -52,7 +52,6 @@ jobs:
         run: |
           docker compose \
             -f '../../Docker/V2/Compose/pgsql/SingleTenant/compose-build-dev.yml' \
-            -f '../../Docker/V2/Compose/pgsql/SingleTenant/compose-build-ods.yml' \
             --env-file './E2E Tests/V2/gh-action-setup/.automation_pgsql.env' \
             up -d
 

.github/workflows/on-prerelease.yml

@@ -326,11 +326,12 @@ jobs:
              PACKAGEVERSION=${REF}
           fi
 
-          if [[ $PACKAGEVERSION =~ "alpha" ]]
+          if [[ $PACKAGEVERSION =~ "pre" ]]
           then
             # Pre-releases get the tag "pre"
             APITAGS="${{ env.IMAGE_NAME }}:pre"
             DBTAGS="${{ env.DATABASE_IMAGE_NAME }}:pre"
+            DBTAGS6x="${{ env.DATABASE_IMAGE_NAME }}:pre-for-6.2"
           else
             # Releases get the version, plus shortened form for minor release.
             # We are not using shortened form for major or using "latest"
@@ -343,6 +344,7 @@ jobs:
           SEMVERSION=${PACKAGEVERSION:1}  # strip off the leading 'v'
           echo "APITAGS=$APITAGS" >> $GITHUB_OUTPUT
           echo "DBTAGS=$DBTAGS" >> $GITHUB_OUTPUT
+          echo "DBTAGS6x=$DBTAGS6x" >> $GITHUB_OUTPUT
           echo "VERSION=$SEMVERSION" >> $GITHUB_OUTPUT
 
       - name: Log in to Docker Hub
@@ -384,7 +386,7 @@ jobs:
         with:
           images: ${{ env.DATABASE_IMAGE_NAME }}
 
-      - name: Build and push admin api database image
+      - name: Build and push admin api database image 7.x
         uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc  # v6.11.0
         with:
           context: "{{defaultContext}}:Docker/Settings/V2/DB-Admin/pgsql"
@@ -395,3 +397,16 @@ jobs:
           tags: ${{ steps.prepare-tags.outputs.DBTAGS }}
           labels: ${{ steps.metadatabase.outputs.labels }}
           push: true
+
+      - name: Build and push admin api database image 6.x
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc  # v6.11.0
+        if: startsWith(github.event.release.tag_name, 'Pre-Release') || startsWith(github.event.release.tag_name, 'v1.')
+        with:
+          context: "{{defaultContext}}:Docker/Settings/V1/DB-Admin/pgsql"
+          cache-from: type=registry,ref=${{ env.DATABASE_IMAGE_NAME }}:pre-for-6.2
+          cache-to: type=inline
+          build-args: ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }}
+          file: Dockerfile
+          tags: ${{ steps.prepare-tags.outputs.DBTAGS6x }}
+          labels: ${{ steps.metadatabase.outputs.labels }}
+          push: true

Application/EdFi.Ods.AdminApi/E2E Tests/V2/gh-action-setup/ods_inspect.sh

@@ -24,4 +24,4 @@ then
 else
     echo "--- Ods API application is failing with status code ${status}"
     exit 2
-fi
+fi

Docker/Settings/V2/gateway/default.conf.template

@@ -27,14 +27,4 @@ server {
         proxy_set_header X-Forwarded-Port 443;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
-
-    location /${ODS_VIRTUAL_NAME} {
-        client_max_body_size 20M;
-        proxy_pass http://ed-fi-ods-api/api;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port 443;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
 }

Docker/Settings/V2/gateway/default_idp.conf.template

@@ -28,15 +28,6 @@ server {
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     }
 
-    location /${ODS_VIRTUAL_NAME} {
-        client_max_body_size 20M;
-        proxy_pass http://ed-fi-ods-api/api;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Port 443;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    }
-
     location /auth {
         proxy_pass http://ed-fi-idp-keycloak:8080/auth;
         proxy_http_version 1.1;

Docker/V1/Compose/pgsql/compose-build-binaries.yml

@@ -78,9 +78,7 @@ services:
       retries: 3
 
   db-admin:
-    build:
-      context: ../../../Settings/V1/DB-Admin/pgsql/
-      dockerfile: Dockerfile
+    image: edfialliance/ods-admin-api-db:pre-for-6.2
     environment:
       POSTGRES_USER: "${POSTGRES_USER}"
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"

Docker/V2/Compose/mssql/MultiTenant/compose-build-ods-multi-tenant.yml

@@ -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

Docker/V2/Compose/mssql/SingleTenant/compose-build-ods.yml

@@ -60,4 +60,4 @@ services:
 volumes:
   vol-db-ods:
     driver: local
-    name: vol-nuget-db-ods-local
+    name: vol-nuget-db-ods-local

Docker/V2/Compose/pgsql/MultiTenant/compose-build-binaries-multi-tenant.yml

@@ -72,11 +72,7 @@ services:
       retries: 3
 
   db-admin-tenant1:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"
@@ -93,11 +89,7 @@ services:
       retries: 3
 
   db-admin-tenant2:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"

Docker/V2/Compose/pgsql/MultiTenant/compose-build-idp-binaries-multi-tenant.yml

@@ -74,11 +74,7 @@ services:
       retries: 3
 
   db-admin-tenant1:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"
@@ -95,11 +91,7 @@ services:
       retries: 3
 
   db-admin-tenant2:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"

Docker/V2/Compose/pgsql/MultiTenant/compose-build-ods-multi-tenant.yml

@@ -79,4 +79,4 @@ volumes:
     name: vol-db-ods-tenant1
   vol-db-ods-tenant2:
     driver: local
-    name: vol-db-ods-tenant2
+    name: vol-db-ods-tenant2

Docker/V2/Compose/pgsql/SingleTenant/compose-build-binaries.yml

@@ -69,11 +69,7 @@ services:
       retries: 3
 
   db-admin:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"

Docker/V2/Compose/pgsql/SingleTenant/compose-build-idp-binaries.yml

@@ -69,11 +69,7 @@ services:
       retries: 3
 
   db-admin:
-    build:
-      context: ../../../../Settings/V2/DB-Admin/pgsql/
-      dockerfile: Dockerfile
-      args:
-        ADMIN_API_VERSION: "${ADMIN_API_VERSION:-2.2.0}"
+    image: edfialliance/ods-admin-api-db:pre
     environment:
       ADMIN_API_VERSION: ${ADMIN_API_VERSION}
       POSTGRES_USER: "${POSTGRES_USER}"

Docker/V2/Compose/pgsql/SingleTenant/compose-build-ods.yml

@@ -59,4 +59,3 @@ volumes:
   vol-db-ods:
     driver: local
     name: vol-db-ods
-