From 9618025031f954115e7badeb83229b61725aa92c Mon Sep 17 00:00:00 2001 From: Sicheng Hao Date: Fri, 15 Apr 2022 09:10:55 -0400 Subject: [PATCH 1/4] updated deploy producation branch note --- README.md | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 02d1f1d0..0a28bcc8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,38 @@ ## Note on deploying the website -Automatic builds have not yet been implemented. +* 1: Add mimic-production to remote +After the pull request of the new material is merged into the main branch of mimic-website, pull down the latest version of main to your local repo. Run the following command after filling in the IP address for server Heimdallr: + +`git remote add mimic-production webuser@:/home/webuser/mimic-website.git` + +* Optional: Check if the command above ran correctly, +Run command: `git remote -v` +should return: +Mimic-production webuser@:/home/webuser/mimic-website.git (fetch) +Mimic-production webuser@:/home/webuser/mimic-website.git (push) +origin https://www.github.com/MIT-LCP/mimic-website (fetch) +origin https://www.github.com/MIT-LCP/mimic-website (push) + +* 2: Sshuttle into the production server + +Run the following command after filling in the LCP username and IP address: `alias sshcsail="sshuttle -r @heimdallr.csail.mit.edu /24"` + +Run command: `sshcsail` + +Should return: “client: Connected” after you enter your password + +* 3: Push development + +In another terminal from your mimic-website repo: + +Run command: `git push mimic-production` + + + +* Note: +Your public key (for the machine you're pushing from) must be in the webuser group + ## Issues with the website or MIMIC From e132654fa8c8c2bc3b65ece3b9829d03791adf4f Mon Sep 17 00:00:00 2001 From: Sicheng Hao Date: Fri, 15 Apr 2022 10:18:46 -0400 Subject: [PATCH 2/4] update based on review --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a28bcc8..f216ed79 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ After the pull request of the new material is merged into the main branch of mim * Optional: Check if the command above ran correctly, Run command: `git remote -v` should return: -Mimic-production webuser@:/home/webuser/mimic-website.git (fetch) -Mimic-production webuser@:/home/webuser/mimic-website.git (push) +mimic-production webuser@:/home/webuser/mimic-website.git (fetch) +mimic-production webuser@:/home/webuser/mimic-website.git (push) origin https://www.github.com/MIT-LCP/mimic-website (fetch) origin https://www.github.com/MIT-LCP/mimic-website (push) @@ -40,10 +40,10 @@ In another terminal from your mimic-website repo: Run command: `git push mimic-production` - * Note: Your public key (for the machine you're pushing from) must be in the webuser group +Currently, some minor errors exist related to reading git log. If error messages show up after push to mimic-production, website deployment might still be successful. It is always good practice to check the website after deployment. ## Issues with the website or MIMIC From 344fd4779246ca49bc1516a179c7c96f91bed483 Mon Sep 17 00:00:00 2001 From: Sicheng Hao Date: Fri, 15 Apr 2022 16:25:17 -0400 Subject: [PATCH 3/4] Edited formatting --- README.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index f216ed79..99e82212 100644 --- a/README.md +++ b/README.md @@ -12,39 +12,39 @@ ## Note on deploying the website -* 1: Add mimic-production to remote -After the pull request of the new material is merged into the main branch of mimic-website, pull down the latest version of main to your local repo. Run the following command after filling in the IP address for server Heimdallr: +1. Add mimic-production to remote + After the pull request of the new material is merged into the main branch of mimic-website, pull down the latest version of main to your local repo. Run the following command after filling in the IP address for server Heimdallr: -`git remote add mimic-production webuser@:/home/webuser/mimic-website.git` + `git remote add mimic-production webuser@:/home/webuser/mimic-website.git` -* Optional: Check if the command above ran correctly, -Run command: `git remote -v` -should return: -mimic-production webuser@:/home/webuser/mimic-website.git (fetch) -mimic-production webuser@:/home/webuser/mimic-website.git (push) -origin https://www.github.com/MIT-LCP/mimic-website (fetch) -origin https://www.github.com/MIT-LCP/mimic-website (push) + * Optional: Check if the command above ran correctly, + Run command: `git remote -v` + should return: + mimic-production webuser@:/home/webuser/mimic-website.git (fetch) + mimic-production webuser@:/home/webuser/mimic-website.git (push) + origin https://www.github.com/MIT-LCP/mimic-website (fetch) + origin https://www.github.com/MIT-LCP/mimic-website (push) -* 2: Sshuttle into the production server +2. Sshuttle into the production server -Run the following command after filling in the LCP username and IP address: `alias sshcsail="sshuttle -r @heimdallr.csail.mit.edu /24"` + Run the following command after filling in the LCP username and IP address: `alias sshcsail="sshuttle -r @heimdallr.csail.mit.edu /24"` -Run command: `sshcsail` + Run command: `sshcsail` -Should return: “client: Connected” after you enter your password + Should return: “client: Connected” after you enter your password -* 3: Push development +3. Push development -In another terminal from your mimic-website repo: + In another terminal from your mimic-website repo: -Run command: `git push mimic-production` + Run command: `git push mimic-production` -* Note: -Your public key (for the machine you're pushing from) must be in the webuser group + * Note: + Your public key (for the machine you're pushing from) must be in the webuser group -Currently, some minor errors exist related to reading git log. If error messages show up after push to mimic-production, website deployment might still be successful. It is always good practice to check the website after deployment. + Currently, some minor errors exist related to reading git log. If error messages show up after push to mimic-production, website deployment might still be successful. It is always good practice to check the website after deployment. ## Issues with the website or MIMIC -Please raise issues related to the website or MIMIC-III in the [mimic-code repository](https://github.com/mit-lcp/mimic-code). \ No newline at end of file +Please raise issues related to the website or MIMIC-III in the [mimic-code repository](https://github.com/mit-lcp/mimic-code). From 2b46fa5dab21830e3d4bdecc6b873abf786608bb Mon Sep 17 00:00:00 2001 From: Sicheng Hao Date: Wed, 14 Sep 2022 15:15:18 -0400 Subject: [PATCH 4/4] Updated deployment guide --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 99e82212..86d27ea1 100644 --- a/README.md +++ b/README.md @@ -15,21 +15,21 @@ 1. Add mimic-production to remote After the pull request of the new material is merged into the main branch of mimic-website, pull down the latest version of main to your local repo. Run the following command after filling in the IP address for server Heimdallr: - `git remote add mimic-production webuser@:/home/webuser/mimic-website.git` + `git remote add mimic-production webuser@:/home/webuser/mimic-website.git` * Optional: Check if the command above ran correctly, Run command: `git remote -v` should return: - mimic-production webuser@:/home/webuser/mimic-website.git (fetch) - mimic-production webuser@:/home/webuser/mimic-website.git (push) + mimic-production webuser@:/home/webuser/mimic-website.git (fetch) + mimic-production webuser@:/home/webuser/mimic-website.git (push) origin https://www.github.com/MIT-LCP/mimic-website (fetch) origin https://www.github.com/MIT-LCP/mimic-website (push) 2. Sshuttle into the production server - Run the following command after filling in the LCP username and IP address: `alias sshcsail="sshuttle -r @heimdallr.csail.mit.edu /24"` + Run the following command after filling in the LCP username and IP address: `alias sshholyoke="sshuttle -r @helios.mit.edu "` - Run command: `sshcsail` + Run command: `sshholyoke` Should return: “client: Connected” after you enter your password @@ -44,6 +44,8 @@ Your public key (for the machine you're pushing from) must be in the webuser group Currently, some minor errors exist related to reading git log. If error messages show up after push to mimic-production, website deployment might still be successful. It is always good practice to check the website after deployment. + + Error message is "Failed to read Git log: fatal: not a git repository: '.'". ## Issues with the website or MIMIC