Skip to content

Commit

Permalink
[ODS-6563] Pre-release tasks for ODS/API 7.3 (#1188)
Browse files Browse the repository at this point in the history
  • Loading branch information
semalaiappan authored Dec 11, 2024
1 parent 9f00274 commit 57d4de0
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Docker/ods-api-bulk-load-console/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN dotnet tool install -g \

# Smaller image
FROM mcr.microsoft.com/dotnet/runtime:8.0.10-alpine3.20@sha256:3230a42af24d0a73b77219bb4bc742aa2fd851b38db62d1decd61fb88a72de07
RUN apk --upgrade --no-cache add gettext=~0 bash=~5 busybox=~1.36 openssl=~3 && \
RUN apk --upgrade --no-cache add gettext=~0 bash=~5 busybox=~1.36 openssl~=3.3.2-r1 && \
addgroup -S edfi && adduser -S edfi -G edfi

LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion Docker/ods-api-db-admin/alpine/pgsql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Base image with additional packages
FROM postgres:16.4-alpine3.20@sha256:ad47523c5154f587f0be492539c76c6c3394e8a7b02f2d86f7b8b32297a862a6 AS base
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl=~3 libxml2=~2
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl~=3.3.2-r1 libxml2=~2

# Start a new layer so that the above layer can be cached
FROM base AS build
Expand Down
2 changes: 1 addition & 1 deletion Docker/ods-api-db-ods-minimal/alpine/pgsql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Base image with additional packages
FROM postgres:16.4-alpine3.20@sha256:ad47523c5154f587f0be492539c76c6c3394e8a7b02f2d86f7b8b32297a862a6 AS base
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl=~3 libxml2=~2
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl~=3.3.2-r1 libxml2=~2

# Start a new layer so that the above layer can be cached
FROM base AS build
Expand Down
2 changes: 1 addition & 1 deletion Docker/ods-api-db-ods-sandbox/alpine/pgsql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Base image with additional packages
FROM postgres:16.4-alpine3.20@sha256:ad47523c5154f587f0be492539c76c6c3394e8a7b02f2d86f7b8b32297a862a6 AS base
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl=~3 libxml2=~2
RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 busybox=~1.36 openssl~=3.3.2-r1 libxml2=~2

# Start a new layer so that the above layer can be cached
FROM base AS build
Expand Down
2 changes: 1 addition & 1 deletion Docker/ods-api-web-api/alpine/pgsql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 icu=~74

# Start a new layer so that the above layer can be cached
FROM base AS build
RUN apk --upgrade --no-cache add postgresql16-client=~16
RUN apk --upgrade --no-cache add postgresql16-client=~16.6
ARG API_VERSION
ARG STANDARD_VERSION
ARG API_URL=https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.Suite3.Ods.WebApi.Standard.${STANDARD_VERSION}/versions/${API_VERSION}/content
Expand Down
2 changes: 1 addition & 1 deletion Docker/ods-api-web-sandbox-admin/alpine/pgsql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apk --upgrade --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 icu=~74

# Start a new layer so that the above layer can be cached
FROM base AS build
RUN apk --upgrade --no-cache add postgresql16-client=~16
RUN apk --upgrade --no-cache add postgresql16-client=~16.6
ARG SANDBOX_VERSION
ARG SANDBOX_URL=https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.Suite3.Ods.SandboxAdmin/versions/${SANDBOX_VERSION}/content

Expand Down

0 comments on commit 57d4de0

Please sign in to comment.