Skip to content
This repository was archived by the owner on Dec 19, 2025. It is now read-only.

[ADMINAPI-1324] ARM64 Container support for DB Admin API 2 #385

Merged
roberthunterjr merged 6 commits into from
Dec 3, 2025
Merged

[ADMINAPI-1324] ARM64 Container support for DB Admin API 2 #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60d9cc7
Add support for multi-platform builds in Docker settings
jagudelo-gap Nov 28, 2025
183bd31
Update Dockerfiles to remove multi-platform support and specify exact…
jagudelo-gap Nov 28, 2025
fa0c5f2
Update unzip version in Dockerfile to 6.0-r15
jagudelo-gap Nov 28, 2025
d6e5117
Update Dockerfile to use unzip version 6.0-r15 and correct base image…
jagudelo-gap Nov 28, 2025
427bea9
Merge branch 'main' into ADMINAPI-1324
jagudelo-gap Dec 2, 2025
1c46e49
Merge branch 'main' into ADMINAPI-1324
jagudelo-gap Dec 2, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/on-prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions Docker/Settings/V2/DB-Admin/pgsql/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <techsupport@ed-fi.org>"

ARG POSTGRES_USER=postgres
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Docker/V2/db.pgsql.admin.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

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/*
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 <techsupport@ed-fi.org>"
Expand Down
Loading