Skip to content

Commit 3d264f9

Browse files
authored
[APIPUB-93] - Update openssl version for dockerfiles (Ed-Fi-Alliance-OSS#95)
* Update openssl version for dockerfiles Update to version 3.3 * Fix vulnerability Update musl version * Add specific version * Update alpine image version to 3.22 * Remove specific versions Remove conflicting versions * Update versions * Pin openssl version * Remove outdated comments
1 parent a84e1ed commit 3d264f9

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# See the LICENSE and NOTICES files in the project root for more information.
55

66
# Tag aspnet:8.0-alpine3.20
7-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.20@sha256:b5b7dec8006fe016cc864f618cf60eab24fb7d7a28c8ecf4f6b90ceeaa5cf9f2
7+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.22@sha256:46be98e65c56f07528fd70dcd0e684b9fe762f4c7256402fcabb8daf45076ddf
88
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
99

1010
ARG VERSION="1.2.1"
@@ -22,7 +22,7 @@ COPY ./Docker/plainTextNamedConnections.template.json /app/plainTextNamedConnect
2222
COPY ./Docker/run.sh /app/run.sh
2323

2424
RUN apk update && \
25-
apk --no-cache add --upgrade unzip=~6 dos2unix=~7 bash=~5 gettext=~0 openssl=3.3.2-r1 postgresql16-client=~16 icu=~74 curl=~8 && \
25+
apk --no-cache add --upgrade unzip=~6 dos2unix=~7 bash=~5 gettext=~0 openssl=3.5.1-r0 postgresql16-client=~16 icu=76.1-r0 curl=~8 && \
2626
wget -nv -O /app/ApiPublisher.zip https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.ApiPublisher/versions/${VERSION}/content && \
2727
unzip /app/ApiPublisher.zip 'EdFi.ApiPublisher/**' -d /app/ && \
2828
mv /app/EdFi.ApiPublisher/* /app/ && \

src/dev.Dockerfile

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

66

77
# tag sdk:8.0 alpine
8-
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20@sha256:07cb8622ca6c4d7600b42b2eccba968dff4b37d41b43a9bf4bd800aa02fab117 AS build
8+
FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.22@sha256:071ec6075f01f91ceaef8f1eaed5d43873635d46441f99221473c456f37f8c20 AS build
99
WORKDIR /source
1010

1111
COPY ./.editorconfig .editorconfig
@@ -37,7 +37,7 @@ RUN dotnet publish -c Release -o /app/EdFi.Tools.ApiPiblisher.Cli --no-build --n
3737

3838

3939
# Tag aspnet:8.0 alpine
40-
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.20@sha256:b5b7dec8006fe016cc864f618cf60eab24fb7d7a28c8ecf4f6b90ceeaa5cf9f2
40+
FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.22@sha256:46be98e65c56f07528fd70dcd0e684b9fe762f4c7256402fcabb8daf45076ddf
4141
LABEL maintainer="Ed-Fi Alliance, LLC and Contributors <techsupport@ed-fi.org>"
4242

4343
# Alpine image does not contain Globalization Cultures library so we need to install ICU library to get fopr LINQ expression to work
@@ -53,7 +53,7 @@ COPY ./Docker/logging.template.json /app/logging.template.json
5353
COPY ./Docker/plainTextNamedConnections.template.json /app/plainTextNamedConnections.template.json
5454
COPY ./Docker/run.sh /app/run.sh
5555

56-
RUN apk --no-cache add --upgrade unzip=~6 dos2unix=~7 bash=~5 openssl=3.3.2-r1 gettext=~0 icu=~74 curl=~8 && \
56+
RUN apk --no-cache add --upgrade unzip=~6 dos2unix=~7 bash=~5 openssl=3.5.1-r0 gettext=~0 icu=76.1-r0 curl=~8 && \
5757
dos2unix /app/*.json && \
5858
dos2unix /app/*.sh && \
5959
chmod 700 /app/*.sh -- ** && \

0 commit comments

Comments
 (0)