Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AA-1744] NET 8 - Update Restsharp - Token Serialization #472

Merged
merged 3 commits into from
Jun 17, 2024
Merged

[AA-1744] NET 8 - Update Restsharp - Token Serialization #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f4c270
[AA-1744] NET 8 - Update Restsharp - Token Serialization
jleiva-gap Jun 13, 2024
8aec2ce
Update TokenRetriever.cs
jleiva-gap Jun 13, 2024
99f3c43
Update pgsql.Dockerfile
jleiva-gap Jun 13, 2024
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
3 changes: 2 additions & 1 deletion Application/EdFi.Ods.AdminApp.Management/Api/TokenRetriever.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ public class TokenRetriever : ITokenRetriever
private readonly OdsApiConnectionInformation _connectionInformation;

/// <summary>
///
/// </summary>
/// <param name="connectionInformation"></param>
/// <param name="connectionInformation"> </param>
public TokenRetriever(OdsApiConnectionInformation connectionInformation)
{
_connectionInformation = connectionInformation;
Expand Down
3 changes: 2 additions & 1 deletion Docker/pgsql.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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" ]
Loading