From 939d1a6a7ba153cfcbf973ddf1029b1eec3784c7 Mon Sep 17 00:00:00 2001 From: CSR2017 <34072978+CSR2017@users.noreply.github.com> Date: Wed, 21 Jun 2023 13:41:21 -0500 Subject: [PATCH] Update the release version on install, docker files (#67) --- Application/EdFi.Ods.AdminApi/appsettings.json | 4 ++-- Application/EdFi.Ods.AdminApi/mssql.Dockerfile | 2 +- Application/EdFi.Ods.AdminApi/pgsql.Dockerfile | 2 +- Installer.AdminApi/install.ps1 | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/EdFi.Ods.AdminApi/appsettings.json b/Application/EdFi.Ods.AdminApi/appsettings.json index 7e6c382ce..85039649f 100644 --- a/Application/EdFi.Ods.AdminApi/appsettings.json +++ b/Application/EdFi.Ods.AdminApi/appsettings.json @@ -14,8 +14,8 @@ "EnableSwagger": false, "EnableDockerEnvironment": false, "ConnectionStrings": { - "Admin": "Data Source=.\\;Initial Catalog=EdFi_Admin;Integrated Security=True;TrustServerCertificate=True", - "Security": "Data Source=.\\;Initial Catalog=EdFi_Security;Integrated Security=True;TrustServerCertificate=True" + "Admin": "Data Source=.\\;Initial Catalog=EdFi_Admin;Integrated Security=True;Encrypt=False", + "Security": "Data Source=.\\;Initial Catalog=EdFi_Security;Integrated Security=True;Encrypt=False" }, "Log4NetCore": { "Log4NetConfigFileName": "log4net\\log4net.config" diff --git a/Application/EdFi.Ods.AdminApi/mssql.Dockerfile b/Application/EdFi.Ods.AdminApi/mssql.Dockerfile index 28bef4fb3..66bffdfd9 100644 --- a/Application/EdFi.Ods.AdminApi/mssql.Dockerfile +++ b/Application/EdFi.Ods.AdminApi/mssql.Dockerfile @@ -6,7 +6,7 @@ #tag 6.0-alpine FROM mcr.microsoft.com/dotnet/aspnet@sha256:201cedd60cb295b2ebea7184561a45c5c0ee337e37300ea0f25cff5a2c762538 LABEL maintainer="Ed-Fi Alliance, LLC and Contributors " -ENV VERSION="1.2.2" +ENV VERSION="1.3.0" # Alpine image does not contain Globalization Cultures library so we need to install ICU library to get for LINQ expression to work # Disable the globaliztion invariant mode (set in base image) diff --git a/Application/EdFi.Ods.AdminApi/pgsql.Dockerfile b/Application/EdFi.Ods.AdminApi/pgsql.Dockerfile index 57a5c389e..048d98f91 100644 --- a/Application/EdFi.Ods.AdminApi/pgsql.Dockerfile +++ b/Application/EdFi.Ods.AdminApi/pgsql.Dockerfile @@ -6,7 +6,7 @@ #tag 6.0-alpine FROM mcr.microsoft.com/dotnet/aspnet@sha256:201cedd60cb295b2ebea7184561a45c5c0ee337e37300ea0f25cff5a2c762538 LABEL maintainer="Ed-Fi Alliance, LLC and Contributors " -ENV VERSION="1.2.2" +ENV VERSION="1.3.0" # Alpine image does not contain Globalization Cultures library so we need to install ICU library to get for LINQ expression to work # Disable the globaliztion invariant mode (set in base image) diff --git a/Installer.AdminApi/install.ps1 b/Installer.AdminApi/install.ps1 index fb1fe750b..22e0ae48c 100644 --- a/Installer.AdminApi/install.ps1 +++ b/Installer.AdminApi/install.ps1 @@ -87,7 +87,7 @@ $p = @{ ToolsPath = "C:/temp/tools" DbConnectionInfo = $dbConnectionInfo OdsApiUrl = "" - PackageVersion = '1.2.2.0' + PackageVersion = '1.3.0.0' PackageSource = $adminApiSource AuthenticationSettings = $authenticationSettings AdminApiFeatures = $adminApiFeatures