Skip to content

Commit 05e5289

Browse files
authored
[ADMINAPI-1324] ARM64 Container support for DB Admin API 2 (#385)
* Add support for multi-platform builds in Docker settings * Update Dockerfiles to remove multi-platform support and specify exact image version * Update unzip version in Dockerfile to 6.0-r15 * Update Dockerfile to use unzip version 6.0-r15 and correct base image tag to 7.3.1
1 parent 0a7d5b3 commit 05e5289

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/on-prerelease.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ jobs:
392392
context: "{{defaultContext}}:Docker/Settings/V2/DB-Admin/pgsql"
393393
cache-from: type=registry,ref=${{ env.DATABASE_IMAGE_NAME }}:pre
394394
cache-to: type=inline
395+
platforms: linux/amd64,linux/arm64
395396
build-args: ADMIN_API_VERSION=${{ steps.prepare-tags.outputs.VERSION }}
396397
file: Dockerfile
397398
tags: ${{ steps.prepare-tags.outputs.DBTAGS }}

Docker/Settings/V2/DB-Admin/pgsql/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
44
# See the LICENSE and NOTICES files in the project root for more information.
55

6-
#edfialliance/ods-api-db-admin:7.3
7-
FROM edfialliance/ods-api-db-admin:7.3@sha256:0a25a039e575464de1fdf09b2db270f00910f937cb782dfa809ac3c192509233 AS base
6+
#edfialliance/ods-api-db-admin:7.3.1
7+
FROM edfialliance/ods-api-db-admin:7.3.1@sha256:9d6c6ad298f5eb2ea58d7b2c1c7ea5f6bdfcd12d90028b98fbfea4237a5610f2 AS base
88
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <[email protected]>"
99

1010
ARG POSTGRES_USER=postgres
@@ -17,7 +17,7 @@ ENV VERSION="${ADMIN_API_VERSION:-2.2.0}"
1717

1818
USER root
1919
COPY run-adminapi-migrations.sh /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh
20-
RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r14 && rm -rf /var/cache/apk/*
20+
RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r15 && rm -rf /var/cache/apk/*
2121
USER ${POSTGRES_USER}
2222

2323
FROM base AS setup

Docker/V2/db.pgsql.admin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
FROM alpine:3.20@sha256:187cce89a2fdd4eaf457a0af45f5ce27672f35ce0f6df49b5b0ee835afe0561b AS assets
77

8-
FROM edfialliance/ods-api-db-admin:7.3@sha256:0a25a039e575464de1fdf09b2db270f00910f937cb782dfa809ac3c192509233 AS base
8+
FROM edfialliance/ods-api-db-admin:7.3.1@sha256:9d6c6ad298f5eb2ea58d7b2c1c7ea5f6bdfcd12d90028b98fbfea4237a5610f2 AS base
99
USER root
10-
RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r14 && rm -rf /var/cache/apk/*
10+
RUN apk add --no-cache dos2unix=7.5.2-r0 unzip=6.0-r15 && rm -rf /var/cache/apk/*
1111

1212
FROM base AS setup
1313
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <[email protected]>"

0 commit comments

Comments
 (0)