From 9dedaa5acf3c8b087c61d529017629e982b6262f Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk <167752252+mzieniukbw@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:12:52 +0200 Subject: [PATCH] Move from Azure SQL Edge to native SQL Server (#4786) * Move from Azure SQL Edge to native SQL Server * Update .devcontainer/bitwarden_common/docker-compose.yml Co-authored-by: Oscar Hinton * Update dev/docker-compose.yml Co-authored-by: Oscar Hinton --------- Co-authored-by: Oscar Hinton --- .devcontainer/bitwarden_common/docker-compose.yml | 7 ++++--- dev/docker-compose.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.devcontainer/bitwarden_common/docker-compose.yml b/.devcontainer/bitwarden_common/docker-compose.yml index ccc5a9ec4..52f0901c7 100644 --- a/.devcontainer/bitwarden_common/docker-compose.yml +++ b/.devcontainer/bitwarden_common/docker-compose.yml @@ -9,7 +9,8 @@ services: command: sleep infinity bitwarden_mssql: - image: mcr.microsoft.com/azure-sql-edge:latest + image: mcr.microsoft.com/mssql/server:2022-latest + platform: linux/amd64 restart: unless-stopped env_file: ../../dev/.env @@ -17,7 +18,7 @@ services: ACCEPT_EULA: "Y" MSSQL_PID: Developer volumes: - - edgesql_dev_data:/var/opt/mssql + - mssql_dev_data:/var/opt/mssql - ../../util/Migrator:/mnt/migrator/ - ../../dev/helpers/mssql:/mnt/helpers - ../../dev/.data/mssql:/mnt/data @@ -29,4 +30,4 @@ services: network_mode: service:bitwarden_server volumes: - edgesql_dev_data: + mssql_dev_data: diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml index 95c00da28..fd316f8ea 100644 --- a/dev/docker-compose.yml +++ b/dev/docker-compose.yml @@ -2,13 +2,14 @@ version: "3.9" services: mssql: - image: mcr.microsoft.com/azure-sql-edge:latest + image: mcr.microsoft.com/mssql/server:2022-latest + platform: linux/amd64 environment: ACCEPT_EULA: "Y" MSSQL_SA_PASSWORD: ${MSSQL_PASSWORD} MSSQL_PID: Developer volumes: - - edgesql_dev_data:/var/opt/mssql + - mssql_dev_data:/var/opt/mssql - ../util/Migrator:/mnt/migrator/ - ./helpers/mssql:/mnt/helpers - ./.data/mssql:/mnt/data @@ -109,6 +110,6 @@ services: - proxy volumes: - edgesql_dev_data: + mssql_dev_data: postgres_dev_data: mysql_dev_data: