From 74d4faf1f6262887dde8a484c39e7644f318f40c Mon Sep 17 00:00:00 2001
From: Jesus Flores <43448209+simpat-jesus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:50:03 -0600
Subject: [PATCH] [ODS-6234] Release Docker images for v5.4 (#186)

* Add SQLSERVER_ENCRYPT env variable

* Update readme files

* Revert unintended change
---
 Compose/mssql/compose-district-specific-env-build.yml    | 1 +
 Compose/mssql/compose-district-specific-env.yml          | 1 +
 Compose/mssql/compose-sandbox-env-build.yml              | 2 ++
 Compose/mssql/compose-sandbox-env.yml                    | 2 ++
 Compose/mssql/compose-shared-instance-env-build.yml      | 1 +
 Compose/mssql/compose-shared-instance-env.yml            | 1 +
 Compose/mssql/compose-year-specific-env-build.yml        | 1 +
 Compose/mssql/compose-year-specific-env.yml              | 1 +
 DB-Admin/Alpine/pgsql/README.md                          | 6 ++++++
 DB-ODS/Alpine/pgsql/README.md                            | 6 ++++++
 DB-Sandbox/Alpine/pgsql/README.md                        | 6 ++++++
 Web-Gateway-Sandbox/Alpine/README.md                     | 6 ++++++
 Web-Gateway/Alpine/README.md                             | 6 ++++++
 Web-Ods-Api/Alpine/mssql/README.md                       | 7 +++++++
 Web-Ods-Api/Alpine/mssql/appsettings.template.json       | 8 ++++----
 Web-Ods-Api/Alpine/pgsql/README.md                       | 6 ++++++
 Web-Sandbox-Admin/Alpine/mssql/README.md                 | 7 +++++++
 Web-Sandbox-Admin/Alpine/mssql/appsettings.template.json | 8 ++++----
 Web-Sandbox-Admin/Alpine/pgsql/README.md                 | 6 ++++++
 Web-SwaggerUI/Alpine/README.md                           | 6 ++++++
 20 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/Compose/mssql/compose-district-specific-env-build.yml b/Compose/mssql/compose-district-specific-env-build.yml
index 79e6fda3..1dd74661 100644
--- a/Compose/mssql/compose-district-specific-env-build.yml
+++ b/Compose/mssql/compose-district-specific-env-build.yml
@@ -37,6 +37,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-district-specific-env.yml b/Compose/mssql/compose-district-specific-env.yml
index 5c60e5d0..d8a9ebab 100644
--- a/Compose/mssql/compose-district-specific-env.yml
+++ b/Compose/mssql/compose-district-specific-env.yml
@@ -33,6 +33,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-sandbox-env-build.yml b/Compose/mssql/compose-sandbox-env-build.yml
index ba47ed59..15b9169a 100644
--- a/Compose/mssql/compose-sandbox-env-build.yml
+++ b/Compose/mssql/compose-sandbox-env-build.yml
@@ -38,6 +38,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     depends_on:
@@ -63,6 +64,7 @@ services:
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       PathBase: "${SANDBOX_ADMIN_VIRTUAL_NAME:-admin}"
       OAuthUrl: "https://localhost/${ODS_VIRTUAL_NAME:-api}/oauth/"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-sandbox-env.yml b/Compose/mssql/compose-sandbox-env.yml
index b0f4cda7..fac5aae1 100644
--- a/Compose/mssql/compose-sandbox-env.yml
+++ b/Compose/mssql/compose-sandbox-env.yml
@@ -34,6 +34,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     depends_on:
@@ -57,6 +58,7 @@ services:
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       PathBase: "${SANDBOX_ADMIN_VIRTUAL_NAME:-admin}"
       OAuthUrl: "https://localhost/${ODS_VIRTUAL_NAME:-api}/oauth/"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-shared-instance-env-build.yml b/Compose/mssql/compose-shared-instance-env-build.yml
index c0448bfe..6b9b691d 100644
--- a/Compose/mssql/compose-shared-instance-env-build.yml
+++ b/Compose/mssql/compose-shared-instance-env-build.yml
@@ -37,6 +37,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-shared-instance-env.yml b/Compose/mssql/compose-shared-instance-env.yml
index f241aec4..4ca57b05 100644
--- a/Compose/mssql/compose-shared-instance-env.yml
+++ b/Compose/mssql/compose-shared-instance-env.yml
@@ -33,6 +33,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-year-specific-env-build.yml b/Compose/mssql/compose-year-specific-env-build.yml
index a9e1b092..9f70504a 100644
--- a/Compose/mssql/compose-year-specific-env-build.yml
+++ b/Compose/mssql/compose-year-specific-env-build.yml
@@ -37,6 +37,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/Compose/mssql/compose-year-specific-env.yml b/Compose/mssql/compose-year-specific-env.yml
index dafa9b71..3c2a8238 100644
--- a/Compose/mssql/compose-year-specific-env.yml
+++ b/Compose/mssql/compose-year-specific-env.yml
@@ -33,6 +33,7 @@ services:
       SQLSERVER_USER: "${SQLSERVER_USER}"
       SQLSERVER_PASSWORD: "${SQLSERVER_PASSWORD}"
       TPDM_ENABLED: "${TPDM_ENABLED:-true}"
+      SQLSERVER_ENCRYPT: ${SQLSERVER_ENCRYPT:-false}
     volumes:
       - ${LOGS_FOLDER}:/app/logs
     restart: always
diff --git a/DB-Admin/Alpine/pgsql/README.md b/DB-Admin/Alpine/pgsql/README.md
index bfd5d6fb..284c6510 100644
--- a/DB-Admin/Alpine/pgsql/README.md
+++ b/DB-Admin/Alpine/pgsql/README.md
@@ -8,6 +8,12 @@ started for the first time.
 for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/DB-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/DB-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/DB-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/DB-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/DB-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/DB-Admin/Alpine/pgsql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/DB-Admin/Alpine/pgsql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/DB-Admin/Alpine/pgsql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/DB-Admin/Alpine/pgsql/Dockerfile)
diff --git a/DB-ODS/Alpine/pgsql/README.md b/DB-ODS/Alpine/pgsql/README.md
index 4d223ad3..b0181034 100644
--- a/DB-ODS/Alpine/pgsql/README.md
+++ b/DB-ODS/Alpine/pgsql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for **_EdFi_Ods_** and the minimal template **_EdFi_O
 **Note: This image is suitable for production use in _shared instance_ mode.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/DB-ODS/Alpine/pgsql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/DB-ODS/Alpine/pgsql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/DB-ODS/Alpine/pgsql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/DB-ODS/Alpine/pgsql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/DB-ODS/Alpine/pgsql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/DB-ODS/Alpine/pgsql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/DB-ODS/Alpine/pgsql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/DB-ODS/Alpine/pgsql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/DB-ODS/Alpine/pgsql/Dockerfile)
diff --git a/DB-Sandbox/Alpine/pgsql/README.md b/DB-Sandbox/Alpine/pgsql/README.md
index faa7db66..0743b439 100644
--- a/DB-Sandbox/Alpine/pgsql/README.md
+++ b/DB-Sandbox/Alpine/pgsql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for ***EdFi_Ods_Sandbox_\****, the minimal template *
 **NOTE: A vendor for Grandbend is installed by default, and this implementation is not recommended for a production environment.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/DB-Sandbox/Alpine/pgsql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/DB-Sandbox/Alpine/pgsql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/DB-Sandbox/Alpine/pgsql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/DB-Sandbox/Alpine/pgsql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/DB-Sandbox/Alpine/pgsql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/DB-Sandbox/Alpine/pgsql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/DB-Sandbox/Alpine/pgsql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/DB-Sandbox/Alpine/pgsql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/DB-Sandbox/Alpine/pgsql/Dockerfile)
diff --git a/Web-Gateway-Sandbox/Alpine/README.md b/Web-Gateway-Sandbox/Alpine/README.md
index d2b3b174..7bf1a8fb 100644
--- a/Web-Gateway-Sandbox/Alpine/README.md
+++ b/Web-Gateway-Sandbox/Alpine/README.md
@@ -2,6 +2,12 @@
 Provides docker deployment for nginx as a proxy for the Ed-Fi ODS/API, along with the SwaggerUI, and the Sandbox Admin tool.
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Gateway-Sandbox/Alpine/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Gateway-Sandbox/Alpine/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Gateway-Sandbox/Alpine/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Gateway-Sandbox/Alpine/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Gateway-Sandbox/Alpine/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Gateway-Sandbox/Alpine/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Gateway-Sandbox/Alpine/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Gateway-Sandbox/Alpine/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Gateway-Sandbox/Alpine/Dockerfile)
diff --git a/Web-Gateway/Alpine/README.md b/Web-Gateway/Alpine/README.md
index 7219d9bd..38144c92 100644
--- a/Web-Gateway/Alpine/README.md
+++ b/Web-Gateway/Alpine/README.md
@@ -2,6 +2,12 @@
 Provides docker deployment for nginx as a proxy for the Ed-Fi ODS/API.
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Gateway/Alpine/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Gateway/Alpine/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Gateway/Alpine/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Gateway/Alpine/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Gateway/Alpine/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Gateway/Alpine/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Gateway/Alpine/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Gateway/Alpine/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Gateway/Alpine/Dockerfile)
diff --git a/Web-Ods-Api/Alpine/mssql/README.md b/Web-Ods-Api/Alpine/mssql/README.md
index 7259d107..be96ab18 100644
--- a/Web-Ods-Api/Alpine/mssql/README.md
+++ b/Web-Ods-Api/Alpine/mssql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for Ed-Fi ODS/API.
 **NOTE: This image is suitable for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Ods-Api/Alpine/mssql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Ods-Api/Alpine/mssql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Ods-Api/Alpine/mssql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Ods-Api/Alpine/mssql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Ods-Api/Alpine/mssql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Ods-Api/Alpine/mssql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Ods-Api/Alpine/mssql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Ods-Api/Alpine/mssql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Ods-Api/Alpine/mssql/Dockerfile)
@@ -21,6 +27,7 @@ SQLSERVER_ODS_DATASOURCE=<DNS or IP Address of the SQL Server Instance, i.e. sql
 SQLSERVER_ADMIN_DATASOURCE=<DNS or IP Address of the SQL Server Instance that contains the Admin/Security/Master databases, i.e. sql.somedns.org or 10.1.5.9,1433>
 SQLSERVER_USER=<SQL Username with access to SQL Server Ed-Fi databases, edfiadmin>
 SQLSERVER_PASSWORD=<SQL Password for the SQLSERVER_USER with access to SQL Server Ed-Fi databases, password123!>
+SQLSERVER_ENCRYPT=<true/false to encrypt connections to SQL Server; if true, then the container must have the proper certificate>
 TPDM_ENABLED=<true/false load TPDM extension> (OPTIONAL, default: true)
 ```
 
diff --git a/Web-Ods-Api/Alpine/mssql/appsettings.template.json b/Web-Ods-Api/Alpine/mssql/appsettings.template.json
index e7a7d305..d2de7459 100644
--- a/Web-Ods-Api/Alpine/mssql/appsettings.template.json
+++ b/Web-Ods-Api/Alpine/mssql/appsettings.template.json
@@ -6,10 +6,10 @@
     }
   },
   "ConnectionStrings": {
-    "EdFi_Ods": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_{0};User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;",
-    "EdFi_Security": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=EdFi_Security;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;",
-    "EdFi_Admin": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=EdFi_Admin;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;",
-    "EdFi_Master": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=master;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;"
+    "EdFi_Ods": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_{0};User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Security": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=EdFi_Security;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Admin": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=EdFi_Admin;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Master": "Data Source=$SQLSERVER_ADMIN_DATASOURCE;Initial Catalog=master;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.WebApi;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT"
   },
   "BearerTokenTimeoutMinutes": "30",
   "DefaultPageSizeLimit": 500,
diff --git a/Web-Ods-Api/Alpine/pgsql/README.md b/Web-Ods-Api/Alpine/pgsql/README.md
index 71e5d3fe..6fe2757e 100644
--- a/Web-Ods-Api/Alpine/pgsql/README.md
+++ b/Web-Ods-Api/Alpine/pgsql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for Ed-Fi ODS/API.
 **NOTE: This image is suitable for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Ods-Api/Alpine/pgsql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Ods-Api/Alpine/pgsql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Ods-Api/Alpine/pgsql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Ods-Api/Alpine/pgsql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Ods-Api/Alpine/pgsql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Ods-Api/Alpine/pgsql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Ods-Api/Alpine/pgsql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Ods-Api/Alpine/pgsql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Ods-Api/Alpine/pgsql/Dockerfile)
diff --git a/Web-Sandbox-Admin/Alpine/mssql/README.md b/Web-Sandbox-Admin/Alpine/mssql/README.md
index 881a4633..896fff2d 100644
--- a/Web-Sandbox-Admin/Alpine/mssql/README.md
+++ b/Web-Sandbox-Admin/Alpine/mssql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for Sandbox Admin tool.
 **NOTE: This image is not recommended for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Sandbox-Admin/Alpine/mssql/Dockerfile)
@@ -26,6 +32,7 @@ MINIMAL_KEY=<minimal template key>
 MINIMAL_SECRET=<minimal template secret>
 POPULATED_KEY=<populated template key>
 POPULATED_SECRET=<populated template secret>
+SQLSERVER_ENCRYPT=<true/false to encrypt connections to SQL Server; if true, then the container must have the proper certificate>
 ```
 
 ## License Information
diff --git a/Web-Sandbox-Admin/Alpine/mssql/appsettings.template.json b/Web-Sandbox-Admin/Alpine/mssql/appsettings.template.json
index 30141161..01a07025 100644
--- a/Web-Sandbox-Admin/Alpine/mssql/appsettings.template.json
+++ b/Web-Sandbox-Admin/Alpine/mssql/appsettings.template.json
@@ -18,10 +18,10 @@
     }
   },
   "ConnectionStrings": {
-    "EdFi_Ods": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_{0};User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;",
-    "EdFi_Security": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_Security;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;",
-    "EdFi_Admin": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_Admin;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;",
-    "EdFi_Master": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=master;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;"
+    "EdFi_Ods": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_{0};User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Security": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_Security;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Admin": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=EdFi_Admin;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT",
+    "EdFi_Master": "Data Source=$SQLSERVER_ODS_DATASOURCE;Initial Catalog=master;User Id=$SQLSERVER_USER;Password=$SQLSERVER_PASSWORD;Application Name=EdFi.Ods.SandboxAdmin;Integrated Security=false;encrypt=$SQLSERVER_ENCRYPT"
   },
   "User": {
     "Test Admin": {
diff --git a/Web-Sandbox-Admin/Alpine/pgsql/README.md b/Web-Sandbox-Admin/Alpine/pgsql/README.md
index 3e9d9cbe..9e4be938 100644
--- a/Web-Sandbox-Admin/Alpine/pgsql/README.md
+++ b/Web-Sandbox-Admin/Alpine/pgsql/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for Sandbox Admin tool.
 **NOTE: This image is not recommended for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-Sandbox-Admin/Alpine/pgsql/Dockerfile)
diff --git a/Web-SwaggerUI/Alpine/README.md b/Web-SwaggerUI/Alpine/README.md
index fc52ae94..595e339e 100644
--- a/Web-SwaggerUI/Alpine/README.md
+++ b/Web-SwaggerUI/Alpine/README.md
@@ -4,6 +4,12 @@ Provides docker deployment for SwaggerUI.
 **NOTE: This image is not recommended for production use.**
 
 ## Image Links
+- [2.1.7](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.7/Web-SwaggerUI/Alpine/Dockerfile)
+- [2.1.6](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.6/Web-SwaggerUI/Alpine/Dockerfile)
+- [2.1.5](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.5/Web-SwaggerUI/Alpine/Dockerfile)
+- [2.1.4](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.4/Web-SwaggerUI/Alpine/Dockerfile)
+- [2.1.3](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.3/Web-SwaggerUI/Alpine/Dockerfile)
+- [2.1.2](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.2/Web-SwaggerUI/Alpine/Dockerfile)
 - [2.1.1](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.1/Web-SwaggerUI/Alpine/Dockerfile)
 - [2.1.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.1.0/Web-SwaggerUI/Alpine/Dockerfile)
 - [2.0.0](https://github.com/Ed-Fi-Alliance-OSS/Ed-Fi-ODS-Docker/blob/v2.0.0/Web-SwaggerUI/Alpine/Dockerfile)