From b8b7228d93075b0801d01f06e2e8f5d8ae9f16ed Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 17 Sep 2024 07:31:11 +0100 Subject: [PATCH 1/4] Move from Azure SQL Edge to native SQL Server --- docs/getting-started/server/guide.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/getting-started/server/guide.md b/docs/getting-started/server/guide.md index 6691e813..a50c31d9 100644 --- a/docs/getting-started/server/guide.md +++ b/docs/getting-started/server/guide.md @@ -125,7 +125,7 @@ To do this, run ```bash docker compose --profile mssql down -docker volume rm bitwardenserver_edgesql_dev_data +docker volume rm bitwardenserver_msssql_dev_data ``` After that, rerun the docker compose command from Step 5. @@ -134,10 +134,10 @@ After that, rerun the docker compose command from Step 5. ### SQL Server -In order to support ARM based development environments such as the M1 Macs, we use the -[Azure SQL Edge](https://hub.docker.com/_/microsoft-azure-sql-edge) docker container instead of a -normal [Microsoft SQL Server](https://hub.docker.com/_/microsoft-mssql-server) container. It behaves -mostly identical to a regular SQL Server instance and runs on port 1433. +For ARM based development environments such as the M1 Macs, we use the +[Microsoft SQL Server](https://hub.docker.com/_/microsoft-mssql-server) docker container with +`linux/amd64` platform emulation. It behaves identical to a SQL Server instance without emulation +and runs on port 1433. You can connect to it using Azure Data Studio using the following credentials: From 98cd2a7daf742a2fd643faa8c06948e9f5a6bfc7 Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 17 Sep 2024 07:35:47 +0100 Subject: [PATCH 2/4] typo fix --- docs/getting-started/server/guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/server/guide.md b/docs/getting-started/server/guide.md index a50c31d9..01b24127 100644 --- a/docs/getting-started/server/guide.md +++ b/docs/getting-started/server/guide.md @@ -125,7 +125,7 @@ To do this, run ```bash docker compose --profile mssql down -docker volume rm bitwardenserver_msssql_dev_data +docker volume rm bitwardenserver_mssql_dev_data ``` After that, rerun the docker compose command from Step 5. From baf1ccde2abec95f32974b67a77bca3a9a15a49d Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 17 Sep 2024 09:51:30 +0100 Subject: [PATCH 3/4] simplifications --- docs/getting-started/server/guide.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/getting-started/server/guide.md b/docs/getting-started/server/guide.md index 01b24127..b011583a 100644 --- a/docs/getting-started/server/guide.md +++ b/docs/getting-started/server/guide.md @@ -134,14 +134,10 @@ After that, rerun the docker compose command from Step 5. ### SQL Server -For ARM based development environments such as the M1 Macs, we use the -[Microsoft SQL Server](https://hub.docker.com/_/microsoft-mssql-server) docker container with -`linux/amd64` platform emulation. It behaves identical to a SQL Server instance without emulation -and runs on port 1433. - -You can connect to it using Azure Data Studio using the following credentials: +You can connect to the Microsoft SQL Server using Azure Data Studio using the following credentials: - Server: localhost +- Port: 1433 - Username: sa - Password: (the password you set in `dev/.env`) From a34a25d09ac85f737109a13292640db896f66474 Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Tue, 17 Sep 2024 09:52:51 +0100 Subject: [PATCH 4/4] grammar correction --- docs/getting-started/server/guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started/server/guide.md b/docs/getting-started/server/guide.md index b011583a..3c273cba 100644 --- a/docs/getting-started/server/guide.md +++ b/docs/getting-started/server/guide.md @@ -134,7 +134,7 @@ After that, rerun the docker compose command from Step 5. ### SQL Server -You can connect to the Microsoft SQL Server using Azure Data Studio using the following credentials: +You can connect to the Microsoft SQL Server using Azure Data Studio with the following credentials: - Server: localhost - Port: 1433