From 4cca8a99d03f03420cd2e0d6e40c4c69378cc0ad Mon Sep 17 00:00:00 2001 From: Mark Kincaid Date: Fri, 30 Jan 2026 16:00:22 -0800 Subject: [PATCH] Update SQL version to SQL 2022 CU22. --- util/MsSql/Dockerfile | 6 +++--- util/MsSql/backup-db.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/MsSql/Dockerfile b/util/MsSql/Dockerfile index 3ce7ce33d1..a67e9c0ab1 100644 --- a/util/MsSql/Dockerfile +++ b/util/MsSql/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/mssql/server:2022-CU12-ubuntu-22.04 +FROM mcr.microsoft.com/mssql/server:2022-CU22-ubuntu-22.04 LABEL com.bitwarden.product="bitwarden" @@ -19,7 +19,7 @@ RUN chmod +x /entrypoint.sh \ RUN /opt/mssql/bin/mssql-conf set telemetry.customerfeedback false -HEALTHCHECK --start-period=120s --timeout=3s CMD /opt/mssql-tools/bin/sqlcmd \ - -S localhost -U sa -P ${SA_PASSWORD} -Q "SELECT 1" || exit 1 +HEALTHCHECK --start-period=120s --timeout=3s CMD /opt/mssql-tools18/bin/sqlcmd \ + -S localhost -U sa -P ${SA_PASSWORD} -C -Q "SELECT 1" || exit 1 ENTRYPOINT ["/entrypoint.sh"] diff --git a/util/MsSql/backup-db.sh b/util/MsSql/backup-db.sh index e5b4f8f84e..10d83d71da 100644 --- a/util/MsSql/backup-db.sh +++ b/util/MsSql/backup-db.sh @@ -14,7 +14,7 @@ do export now=$(date +%Y%m%d_%H%M%S) # Do a new backup - /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -i /backup-db.sql + /opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P ${SA_PASSWORD} -C -i /backup-db.sql # Delete backup files older than 30 days grep -B1 "BACKUP DATABASE successfully" /var/opt/mssql/log/errorlog | grep -q _$now.BAK &&