From 2f4c2701e1a18f6e23ff9a3b3f5cb084b2702ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Leiva=20Obando?= Date: Thu, 13 Jun 2024 16:15:35 -0600 Subject: [PATCH 1/3] [AA-1744] NET 8 - Update Restsharp - Token Serialization Rollback docker file change --- Docker/pgsql.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Docker/pgsql.Dockerfile b/Docker/pgsql.Dockerfile index cd867a29..dd3df6e2 100644 --- a/Docker/pgsql.Dockerfile +++ b/Docker/pgsql.Dockerfile @@ -38,4 +38,5 @@ RUN apk --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 postgresql13-clie EXPOSE 80 + ENTRYPOINT [ "/app/run.sh" ] From 8aec2cef763ad5decb49cb7f207bf40f46ba5385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Leiva=20Obando?= Date: Thu, 13 Jun 2024 16:54:55 -0600 Subject: [PATCH 2/3] Update TokenRetriever.cs --- Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs b/Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs index 024b1d45..7273a715 100644 --- a/Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs +++ b/Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs @@ -22,8 +22,9 @@ public class TokenRetriever : ITokenRetriever private readonly OdsApiConnectionInformation _connectionInformation; /// + /// /// - /// + /// public TokenRetriever(OdsApiConnectionInformation connectionInformation) { _connectionInformation = connectionInformation; From 99f3c43eeaad994f5a6eee72aa1255b3168735e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Alberto=20Leiva=20Obando?= Date: Thu, 13 Jun 2024 16:59:18 -0600 Subject: [PATCH 3/3] Update pgsql.Dockerfile --- Docker/pgsql.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docker/pgsql.Dockerfile b/Docker/pgsql.Dockerfile index dd3df6e2..c1f29c3b 100644 --- a/Docker/pgsql.Dockerfile +++ b/Docker/pgsql.Dockerfile @@ -24,7 +24,7 @@ COPY Settings/pgsql/run.sh /app/run.sh COPY Settings/pgsql/log4net.config /app/log4net.txt RUN apk --no-cache add unzip=~6 dos2unix=~7 bash=~5 gettext=~0 postgresql13-client=~13 jq=~1 icu=~74 curl=~8 && \ - wget -nv -O /app/AdminApp.zip "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.Suite3.ODS.AdminApp.Web/versions/3.3.1-alpha.0.5/content" && \ + wget -nv -O /app/AdminApp.zip "https://pkgs.dev.azure.com/ed-fi-alliance/Ed-Fi-Alliance-OSS/_apis/packaging/feeds/EdFi/nuget/packages/EdFi.Suite3.ODS.AdminApp.Web/versions/${VERSION}/content" && \ unzip /app/AdminApp.zip AdminApp/* -d /app/ && \ cp -r /app/AdminApp/. /app/ && \ rm -f /app/AdminApp.zip && \