From 60d9cc70772808ef47cb97d4f754940d7b861ded Mon Sep 17 00:00:00 2001 From: Juan Agudelo Date: Fri, 28 Nov 2025 17:07:49 -0500 Subject: [PATCH 1/4] Add support for multi-platform builds in Docker settings --- .github/workflows/on-prerelease.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/on-prerelease.yml b/.github/workflows/on-prerelease.yml index b2f6833c4..b9bbd56b9 100644 --- a/.github/workflows/on-prerelease.yml +++ b/.github/workflows/on-prerelease.yml @@ -392,6 +392,7 @@ jobs: context: "{{defaultContext}}:Docker/Settings/V2/DB-Admin/pgsql" cache-from: type=registry,ref=${{ env.DATABASE_IMAGE_NAME }}:pre cache-to: type=inline + platforms: linux/amd64,linux/arm64 build-args: ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }} file: Dockerfile tags: ${{ steps.prepare-tags.outputs.DBTAGS }} @@ -405,6 +406,7 @@ jobs: 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 + platforms: linux/amd64,linux/arm64 build-args: ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }} file: Dockerfile tags: ${{ steps.prepare-tags.outputs.DBTAGS6x }} From 183bd31ceea01e29da9c26377f14ece857d64efb Mon Sep 17 00:00:00 2001 From: Juan Agudelo Date: Fri, 28 Nov 2025 18:07:16 -0500 Subject: [PATCH 2/4] Update Dockerfiles to remove multi-platform support and specify exact image version --- .github/workflows/on-prerelease.yml | 1 - Docker/V2/db.pgsql.admin.Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/on-prerelease.yml b/.github/workflows/on-prerelease.yml index b9bbd56b9..7c7e4ebbf 100644 --- a/.github/workflows/on-prerelease.yml +++ b/.github/workflows/on-prerelease.yml @@ -406,7 +406,6 @@ jobs: 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 - platforms: linux/amd64,linux/arm64 build-args: ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }} file: Dockerfile tags: ${{ steps.prepare-tags.outputs.DBTAGS6x }} diff --git a/Docker/V2/db.pgsql.admin.Dockerfile b/Docker/V2/db.pgsql.admin.Dockerfile index 5e845dff1..40da1e151 100644 --- a/Docker/V2/db.pgsql.admin.Dockerfile +++ b/Docker/V2/db.pgsql.admin.Dockerfile @@ -5,7 +5,7 @@ FROM alpine:3.20@sha256:187cce89a2fdd4eaf457a0af45f5ce27672f35ce0f6df49b5b0ee835afe0561b AS assets -FROM edfialliance/ods-api-db-admin:7.3@sha256:0a25a039e575464de1fdf09b2db270f00910f937cb782dfa809ac3c192509233 AS base +FROM edfialliance/ods-api-db-admin:7.3.1@sha256:9d6c6ad298f5eb2ea58d7b2c1c7ea5f6bdfcd12d90028b98fbfea4237a5610f2 AS base USER root RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r14 && rm -rf /var/cache/apk/* From fa0c5f21d028c5ebb07da2b128f2a8fc91936509 Mon Sep 17 00:00:00 2001 From: Juan Agudelo Date: Fri, 28 Nov 2025 18:22:35 -0500 Subject: [PATCH 3/4] Update unzip version in Dockerfile to 6.0-r15 --- Docker/V2/db.pgsql.admin.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/V2/db.pgsql.admin.Dockerfile b/Docker/V2/db.pgsql.admin.Dockerfile index 40da1e151..a4334e31f 100644 --- a/Docker/V2/db.pgsql.admin.Dockerfile +++ b/Docker/V2/db.pgsql.admin.Dockerfile @@ -7,7 +7,7 @@ FROM alpine:3.20@sha256:187cce89a2fdd4eaf457a0af45f5ce27672f35ce0f6df49b5b0ee835 FROM edfialliance/ods-api-db-admin:7.3.1@sha256:9d6c6ad298f5eb2ea58d7b2c1c7ea5f6bdfcd12d90028b98fbfea4237a5610f2 AS base USER root -RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r14 && rm -rf /var/cache/apk/* +RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r15 && rm -rf /var/cache/apk/* FROM base AS setup LABEL maintainer="Ed-Fi Alliance, LLC and Contributors " From d6e5117e01bf4b3ee1379606e65ad9f11a352a25 Mon Sep 17 00:00:00 2001 From: Juan Agudelo Date: Fri, 28 Nov 2025 18:24:56 -0500 Subject: [PATCH 4/4] Update Dockerfile to use unzip version 6.0-r15 and correct base image tag to 7.3.1 --- Docker/Settings/V2/DB-Admin/pgsql/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Docker/Settings/V2/DB-Admin/pgsql/Dockerfile b/Docker/Settings/V2/DB-Admin/pgsql/Dockerfile index a4d4ec193..bfcf97447 100644 --- a/Docker/Settings/V2/DB-Admin/pgsql/Dockerfile +++ b/Docker/Settings/V2/DB-Admin/pgsql/Dockerfile @@ -3,8 +3,8 @@ # The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. # See the LICENSE and NOTICES files in the project root for more information. -#edfialliance/ods-api-db-admin:7.3 -FROM edfialliance/ods-api-db-admin:7.3@sha256:0a25a039e575464de1fdf09b2db270f00910f937cb782dfa809ac3c192509233 AS base +#edfialliance/ods-api-db-admin:7.3.1 +FROM edfialliance/ods-api-db-admin:7.3.1@sha256:9d6c6ad298f5eb2ea58d7b2c1c7ea5f6bdfcd12d90028b98fbfea4237a5610f2 AS base LABEL maintainer="Ed-Fi Alliance, LLC and Contributors " ARG POSTGRES_USER=postgres @@ -17,7 +17,7 @@ ENV VERSION="${ADMIN_API_VERSION:-2.2.0}" USER root COPY run-adminapi-migrations.sh /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh -RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r14 && rm -rf /var/cache/apk/* +RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r15 && rm -rf /var/cache/apk/* USER ${POSTGRES_USER} FROM base AS setup