From dca0735623847bb0b3e4c328ebbd9362718a0e9d Mon Sep 17 00:00:00 2001
From: Alexandra Hobbs <ahobbs@contractor.usgs.gov>
Date: Mon, 9 Dec 2024 13:07:57 -0700
Subject: [PATCH 1/4] add some instructions for windows

---
 localdev/local_development.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/localdev/local_development.md b/localdev/local_development.md
index ae659a92..9dfd6c38 100644
--- a/localdev/local_development.md
+++ b/localdev/local_development.md
@@ -4,10 +4,17 @@
 This docker-compose uses the main Dockerfile to create a `localdev-web-1` container and creates a mysql container called `localdev-database-1` and an edge container called `localdev-edge-1`.
 
 ## Prerequisites
+1. Download docker without Docker Desktop, at least version 27.0.1.
+
 For mac development:
 1. Download colima using homebrew.
 2. Start colima and edit virtual machine sizes using `colima start --edit`. Increase the number of CPUs to 16 and the memory to 16.
-3. Add the following env vars to your .bashrc or .zshrc or an .env file. See the instructions [here](../docs/metadata_webservice.md) for instructions on creating the OPENID_CLIENT_ID and OPENID_CLIENT_SECRET. The rest of the values can be set to strings of your choice. If you set the values in your .bashrc or .zshrc, run the source command to pick up the new values (ex `source ~/.bashrc`).
+
+For windows development:
+1. Install Docker on WSL2. You can find instructions [here](https://docs.docker.com/engine/install/ubuntu/).
+
+For both OS:
+Add the following env vars to your .bashrc or .zshrc or an .env file. See the instructions [here](../docs/metadata_webservice.md) for instructions on creating the OPENID_CLIENT_ID and OPENID_CLIENT_SECRET. The rest of the values can be set to strings of your choice. If you set the values in your .bashrc or .zshrc, run the source command to pick up the new values (ex `source ~/.bashrc`).
 ```
 export OPENID_CLIENT_ID=""
 export OPENID_CLIENT_SECRET=""
-- 
GitLab


From 74ce03aabb257a6ac15955edb45cf069aabdd681 Mon Sep 17 00:00:00 2001
From: Alexandra Hobbs <ahobbs@contractor.usgs.gov>
Date: Mon, 9 Dec 2024 13:23:38 -0700
Subject: [PATCH 2/4] add space for readability

---
 localdev/local_development.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/localdev/local_development.md b/localdev/local_development.md
index 9dfd6c38..8f8405fa 100644
--- a/localdev/local_development.md
+++ b/localdev/local_development.md
@@ -14,6 +14,7 @@ For windows development:
 1. Install Docker on WSL2. You can find instructions [here](https://docs.docker.com/engine/install/ubuntu/).
 
 For both OS:
+
 Add the following env vars to your .bashrc or .zshrc or an .env file. See the instructions [here](../docs/metadata_webservice.md) for instructions on creating the OPENID_CLIENT_ID and OPENID_CLIENT_SECRET. The rest of the values can be set to strings of your choice. If you set the values in your .bashrc or .zshrc, run the source command to pick up the new values (ex `source ~/.bashrc`).
 ```
 export OPENID_CLIENT_ID=""
-- 
GitLab


From 9236ca2269899001dd1ff28db9b37999240cf3d4 Mon Sep 17 00:00:00 2001
From: Alexandra Hobbs <ahobbs@contractor.usgs.gov>
Date: Mon, 9 Dec 2024 14:14:47 -0700
Subject: [PATCH 3/4] add context. fix typo

---
 localdev/local_development.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/localdev/local_development.md b/localdev/local_development.md
index 8f8405fa..08b35cdd 100644
--- a/localdev/local_development.md
+++ b/localdev/local_development.md
@@ -29,11 +29,13 @@ To simply start build and run all the containers, make sure you are in the /loca
 ```
 docker-compose up
 ```
+or `docker compose up` if you're not using the docker-compose plugin.
 
 If you're not developing locally, use the following command to run the containers in the background. Reload will not work this way.
 ```
-docker-compmose up -d 
+docker-compose up -d 
 ```
+or `docker compose up -d` if not using the docker-compose plugin.
 
 ## Helpful Docker Commands
 `docker ps` shows the running containers. 
-- 
GitLab


From a75d77ba3c28346864624cd6e95e39fb56c43ec9 Mon Sep 17 00:00:00 2001
From: Alexandra Hobbs <ahobbs@contractor.usgs.gov>
Date: Mon, 9 Dec 2024 14:16:04 -0700
Subject: [PATCH 4/4] grammar fix

---
 localdev/local_development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/localdev/local_development.md b/localdev/local_development.md
index 08b35cdd..487984ea 100644
--- a/localdev/local_development.md
+++ b/localdev/local_development.md
@@ -25,7 +25,7 @@ export MYSQL_ROOT_PASSWORD=""
 ```
 
 ## Use
-To simply start build and run all the containers, make sure you are in the /localdev directory and run the following command. This includes a reload command for the web container. It will restart the web container when changes are made locally.
+To simply build and run all the containers, make sure you are in the /localdev directory and run the following command. This includes a reload command for the web container. It will restart the web container when changes are made locally.
 ```
 docker-compose up
 ```
-- 
GitLab