From 1b9e4950aeb4801a768af491d932432dcefc1f5e Mon Sep 17 00:00:00 2001 From: Micaiah Martin Date: Thu, 20 Aug 2026 15:17:32 -0600 Subject: [PATCH] Move MSSQL base to mcr.microsoft.com/mssql/rhel/server --- .github/workflows/build.yml | 1 + util/MsSql/Dockerfile | 8 +------- util/MsSql/entrypoint.sh | 7 +++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d19c894f5e2..f1df8bb7e6c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,6 +76,7 @@ jobs: dotnet: true - project_name: MsSql base_path: ./util + platforms: linux/amd64 - project_name: MsSqlMigratorUtility base_path: ./util dotnet: true diff --git a/util/MsSql/Dockerfile b/util/MsSql/Dockerfile index f9c6f1f7bba4..a6d1bb019f3a 100644 --- a/util/MsSql/Dockerfile +++ b/util/MsSql/Dockerfile @@ -1,15 +1,9 @@ -FROM mcr.microsoft.com/mssql/server:2025-CU5-ubuntu-22.04 +FROM mcr.microsoft.com/mssql/rhel/server:2025-CU5-rhel-9.1 LABEL com.bitwarden.product="bitwarden" USER root:root -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - gosu \ - tzdata \ - && rm -rf /var/lib/apt/lists/* - COPY util/MsSql/backup-db.sql / COPY util/MsSql/backup-db.sh / COPY util/MsSql/entrypoint.sh / diff --git a/util/MsSql/entrypoint.sh b/util/MsSql/entrypoint.sh index 309bf4d0ed31..37e9552db32c 100644 --- a/util/MsSql/entrypoint.sh +++ b/util/MsSql/entrypoint.sh @@ -27,6 +27,9 @@ useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 || usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 mkhomedir_helper $USERNAME +# setpriv, update the $HOME for the target user +export HOME=/home/$USERNAME + # Read the SA_PASSWORD value from a file for swarm environments. # See https://github.com/Microsoft/mssql-docker/issues/326 if [ ! -z "$SA_PASSWORD" ] && [ ! -z "$SA_PASSWORD_FILE" ] @@ -59,7 +62,7 @@ chown $USERNAME:$GROUPNAME /backup-db.sql # Launch a loop to backup database on a daily basis if [ "$BACKUP_DB" != "0" ] then - gosu $USERNAME:$GROUPNAME /bin/sh -c "/backup-db.sh loop >/dev/null 2>&1 &" + setpriv --reuid $USERNAME --regid $GROUPNAME --init-groups /bin/sh -c "/backup-db.sh loop >/dev/null 2>&1 &" fi -exec gosu $USERNAME:$GROUPNAME /opt/mssql/bin/sqlservr +exec setpriv --reuid $USERNAME --regid $GROUPNAME --init-groups /opt/mssql/bin/sqlservr