From 2eb18cfb9d6c9f58419ca0f97a45befd6ffdcd7b Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 17 Feb 2023 14:14:28 -0500 Subject: [PATCH 01/34] Update issue templates Add correct labels to each issue template (3) --- .github/ISSUE_TEMPLATE/completed-lists.md | 2 +- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md index c5cea21c..598dcc23 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/completed-lists.md @@ -2,7 +2,7 @@ name: Completed Lists about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) -labels: Compiled List +labels: '' assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..4257e873 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -2,7 +2,7 @@ name: Things I Don't Understand about: This is for adding issues that you don't understand title: '' -labels: Things I Don't Understand +labels: i don't understand assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..67a10cf1 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: "[Things I Learned]" -labels: Things I learned +labels: i learned assignees: '' --- diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..3b2a98ac 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -1,8 +1,8 @@ --- name: Things I want to know -about: Describe this issue template's purpose here. +about: Please describe what you want to know in less than 255 characters. title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned +labels: i want to know assignees: '' --- From d073b860aed4bb94ba93390a935e693dcab626b0 Mon Sep 17 00:00:00 2001 From: chwicklund <70772508+chwicklund@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:41:22 -0500 Subject: [PATCH 02/34] Update things-i-don-t-understand.md --- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 472a5362..0524d63d 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -1,7 +1,7 @@ --- name: Things I Don't Understand about: This is for adding issues that you don't understand -title: '' +title: idk labels: Things I Don't Understand assignees: '' From a87d610fe9e66a854d68c9aae8087bc529c9000c Mon Sep 17 00:00:00 2001 From: chwicklund <70772508+chwicklund@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:42:25 -0500 Subject: [PATCH 03/34] Update things-i-don-t-understand.md --- .github/ISSUE_TEMPLATE/things-i-don-t-understand.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md index 0524d63d..0dd6933d 100644 --- a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md +++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md @@ -1,8 +1,8 @@ --- name: Things I Don't Understand about: This is for adding issues that you don't understand -title: idk -labels: Things I Don't Understand +title: (Thing I Don't Understand) +labels: idk assignees: '' --- From 484b1129dedd550b41a03fdd05393be61ab8fc49 Mon Sep 17 00:00:00 2001 From: chwicklund <70772508+chwicklund@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:43:10 -0500 Subject: [PATCH 04/34] Update things-i-learned.md --- .github/ISSUE_TEMPLATE/things-i-learned.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index ff68fa38..5a79e64d 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -1,8 +1,8 @@ --- name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters -title: "[Things I Learned]" -labels: Things I learned +title: (Things I Learned) +labels: i wanna learn assignees: '' --- From 4a857508bc01f4b8ef96c7ab0e82e43df67a05a2 Mon Sep 17 00:00:00 2001 From: chwicklund <70772508+chwicklund@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:44:13 -0500 Subject: [PATCH 05/34] Update things-i-want-to-know.md --- .github/ISSUE_TEMPLATE/things-i-want-to-know.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md index 025fa8f1..a5ec99d8 100644 --- a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md +++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md @@ -1,8 +1,8 @@ --- name: Things I want to know -about: Describe this issue template's purpose here. -title: 'Thing I want to know: [Thing I want to Knows]' -labels: Things I learned +about: Describe something you want to learn. +title: '(Thing I want to know)' +labels: i wanna learn assignees: '' --- From af02b1481d77fa9e063399065d4e7624939e4f67 Mon Sep 17 00:00:00 2001 From: chwicklund <70772508+chwicklund@users.noreply.github.com> Date: Wed, 22 Feb 2023 12:45:15 -0500 Subject: [PATCH 06/34] Update things-i-learned.md --- .github/ISSUE_TEMPLATE/things-i-learned.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/things-i-learned.md b/.github/ISSUE_TEMPLATE/things-i-learned.md index 5a79e64d..44512484 100644 --- a/.github/ISSUE_TEMPLATE/things-i-learned.md +++ b/.github/ISSUE_TEMPLATE/things-i-learned.md @@ -2,7 +2,7 @@ name: Things I learned about: Add one item for each thing you learned keep to max of 255 characters title: (Things I Learned) -labels: i wanna learn +labels: i know assignees: '' --- From c7a775811b5a1375d782c78937d7e2d67db9ffa0 Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 17:16:13 -0500 Subject: [PATCH 07/34] Task: edited list --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0b49fb1d..bde16070 100644 --- a/README.md +++ b/README.md @@ -11,19 +11,19 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. -### Your list should look like this: -#### Things we understand** -1. Python Print[1] -2. Linux Directory listing[2] -3. Docker Installation[1] +### List: +#### Things we understand +1. [1] +2. [1] +3. [1] #### Things we don't understand 1. Git Stash[1] -2. GIt pull[2] -3. GIT status[1] -#### Things we want to know next** -1. Elastic Search Indexing [1] -2. Cloud deployment with Kubernetes[2] -3. Teraform[1] +2. [1] +3. [1] +#### Things we want to know next +1. [1] +2. [1] +3. [1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 494517ebddc051d271904f92cc0683880d93ccfa Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 17:21:40 -0500 Subject: [PATCH 08/34] Resolving merge conflicts on fork --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bde16070..232892b7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. [1] #### Things we don't understand 1. Git Stash[1] -2. [1] +2. Resolving merge conflict on fork[1] 3. [1] #### Things we want to know next 1. [1] From 63c2d4261bc081fbda1ef81557a3b535b4dbb260 Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 17:25:28 -0500 Subject: [PATCH 09/34] #3 Difference between Docker container and Docker repository --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 232892b7..20cf5f07 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we don't understand 1. Git Stash[1] 2. Resolving merge conflict on fork[1] -3. [1] +3. Difference between Docker container and Docker repository[1] #### Things we want to know next 1. [1] 2. [1] From 3c77e0ae1fb543edf446f2c9a16b960e352f89de Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 17:56:38 -0500 Subject: [PATCH 10/34] #4 How to host a website on Oracle Cloud from a Github repo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20cf5f07..8984060d 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Resolving merge conflict on fork[1] 3. Difference between Docker container and Docker repository[1] #### Things we want to know next -1. [1] -2. [1] +1. How to host a website on Oracle Cloud from a Github repo[1] +2. [1] 3. [1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 75b6610cab7a1941033470ef810658e0cefefc6e Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 18:01:00 -0500 Subject: [PATCH 11/34] #5 Increasing security on web server/web page --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8984060d..5368dba2 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. Difference between Docker container and Docker repository[1] #### Things we want to know next 1. How to host a website on Oracle Cloud from a Github repo[1] -2. [1] +2. Increasing security on web server/web page[1] 3. [1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From 9c53540dc1048f3343d431a97970dada2391406c Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 18:05:25 -0500 Subject: [PATCH 12/34] #6 Customizing parameters of docker-compose files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5368dba2..f5612146 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next 1. How to host a website on Oracle Cloud from a Github repo[1] 2. Increasing security on web server/web page[1] -3. [1] +3. Customizing parameters of docker-compose files[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From f58261544a9ab2eff42557f9f5453f7e74abfccd Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 18:06:55 -0500 Subject: [PATCH 13/34] #7 Linux Directory Navigation --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f5612146..1c641c85 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### List: #### Things we understand -1. [1] -2. [1] -3. [1] +1. Linux Directory Navigation[1] +2. [1] +3. [1] #### Things we don't understand 1. Git Stash[1] 2. Resolving merge conflict on fork[1] From 3c5c061d3bf1ee8c4adeebfcd1a4d30f01af45e7 Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 18:08:56 -0500 Subject: [PATCH 14/34] #8 Running Docker Compose --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c641c85..e21ad09a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### List: #### Things we understand 1. Linux Directory Navigation[1] -2. [1] +2. Running Docker Compose[1] 3. [1] #### Things we don't understand 1. Git Stash[1] From b58d6d12a2cb14c9b94270c12b2643b9b5668110 Mon Sep 17 00:00:00 2001 From: Charles Wicklund Date: Fri, 24 Feb 2023 18:10:39 -0500 Subject: [PATCH 15/34] #9 Installing NPM --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e21ad09a..d50a2ccf 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand 1. Linux Directory Navigation[1] 2. Running Docker Compose[1] -3. [1] +3. Installing NPM[1] #### Things we don't understand 1. Git Stash[1] 2. Resolving merge conflict on fork[1] From d30ebbd983b463f0d402602d5b6635358ee20bf9 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 20:11:40 -0500 Subject: [PATCH 16/34] Update issue templates (add master list label) --- .github/ISSUE_TEMPLATE/completed-lists.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md index 598dcc23..67c1468a 100644 --- a/.github/ISSUE_TEMPLATE/completed-lists.md +++ b/.github/ISSUE_TEMPLATE/completed-lists.md @@ -2,7 +2,7 @@ name: Completed Lists about: This is for your master pull request to merge your master into this repo. title: Put your UCID as the title (replace this text) -labels: '' +labels: master list assignees: '' --- From d7bcb4bdf965804277b34ec0b693cc232b51abdf Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 20:56:55 -0500 Subject: [PATCH 17/34] added first 'do not understand' item to list --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0b49fb1d..a864dd51 100644 --- a/README.md +++ b/README.md @@ -11,19 +11,19 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned. The number in the bracket next to each issue is the count, you should set your count at 1 for your issue. We need the count of how many times the issue is mentioned, so that we can prioritze each issue. -### Your list should look like this: +### Our List: #### Things we understand** -1. Python Print[1] -2. Linux Directory listing[2] -3. Docker Installation[1] +1. +2. +3. #### Things we don't understand -1. Git Stash[1] -2. GIt pull[2] -3. GIT status[1] +1. Resolving merge conflicts with GitHub forks [1] +2. +3. #### Things we want to know next** -1. Elastic Search Indexing [1] -2. Cloud deployment with Kubernetes[2] -3. Teraform[1] +1. +2. +3. ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 8b560ffa73d8067701f69b214a8c208c6bb44861 Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:17:26 -0500 Subject: [PATCH 18/34] add second 'don't understand' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a864dd51..4c0d2022 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. #### Things we don't understand 1. Resolving merge conflicts with GitHub forks [1] -2. +2. Web domain configuration [1] 3. #### Things we want to know next** 1. From 76627f6ee4d59239d424eb9a9231df51ff29d342 Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:24:36 -0500 Subject: [PATCH 19/34] add third 'don't understand' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c0d2022..4b6abce0 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we don't understand 1. Resolving merge conflicts with GitHub forks [1] 2. Web domain configuration [1] -3. +3. VM and Docker configuration customization [1] #### Things we want to know next** 1. 2. From 55d9ba8a58a1ec8258eaeef967875f3dfc2f26fb Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:28:46 -0500 Subject: [PATCH 20/34] add first 'understand' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b6abce0..22dfe44a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Our List: #### Things we understand** -1. +1. Oracle Cloud Instance set-up [1] 2. 3. #### Things we don't understand From 95d30039a6995006654a612ae56d2f75c5ff495d Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:33:52 -0500 Subject: [PATCH 21/34] add second 'understand' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22dfe44a..8d3ada11 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Our List: #### Things we understand** 1. Oracle Cloud Instance set-up [1] -2. +2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration [1] 3. #### Things we don't understand 1. Resolving merge conflicts with GitHub forks [1] From b59fbb56c3f5beef39a342a2de28f31fcfbc090d Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:38:12 -0500 Subject: [PATCH 22/34] add third 'understand' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d3ada11..9afac458 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand** 1. Oracle Cloud Instance set-up [1] 2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration [1] -3. +3. Basic BASH script commands (directory navigation, file creation, and text editing) [1] #### Things we don't understand 1. Resolving merge conflicts with GitHub forks [1] 2. Web domain configuration [1] From 511fb9fbb789d9eb6e5126ffeea0f2da9010610a Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:41:56 -0500 Subject: [PATCH 23/34] add first 'want to know' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9afac458..4b5a1c81 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Web domain configuration [1] 3. VM and Docker configuration customization [1] #### Things we want to know next** -1. +1. Host a website on Oracle Cloud from a GitHub repository [1] 2. 3. From 5a2614812586eebb28e2bb04bcd2059af2400e5e Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:45:50 -0500 Subject: [PATCH 24/34] add second 'want to know' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b5a1c81..b816c23f 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 3. VM and Docker configuration customization [1] #### Things we want to know next** 1. Host a website on Oracle Cloud from a GitHub repository [1] -2. +2. Website content management [1] 3. ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL From cbceec163dd382b654c6499369ca99ac77dbde32 Mon Sep 17 00:00:00 2001 From: Eileen Sanchez Date: Fri, 24 Feb 2023 21:49:34 -0500 Subject: [PATCH 25/34] add third 'want to know' item to list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b816c23f..82498cb8 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we want to know next** 1. Host a website on Oracle Cloud from a GitHub repository [1] 2. Website content management [1] -3. +3. Responsive web page design and development [1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 0272c06dddcf70a6628214853060a3554e49a909 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:52:54 -0500 Subject: [PATCH 26/34] Revert "#9 npm" --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ca83667c..b01dc024 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Oracle Cloud Instance set-up[1] 3. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1] 4. Running Docker Compose[1] -5. Installing NPM[1] #### Things we don't understand 1. Resolving merge conflicts with GitHub forks[2] 2. Web domain configuration[1] From b58ccb9ac0f3e96301645692918e778f255f81e4 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:55:02 -0500 Subject: [PATCH 27/34] Revert "#8 running" --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b01dc024..1cd5c4be 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,9 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Our List: #### Things we understand** -1. Basic Linux BASH script commands (directory navigation, file creation, and text editing)[2] -2. Oracle Cloud Instance set-up[1] -3. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1] -4. Running Docker Compose[1] +1. Oracle Cloud Instance set-up[1] +2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1] +3. Basic Linux BASH script commands (directory navigation, file creation, and text editing)[2] #### Things we don't understand 1. Resolving merge conflicts with GitHub forks[2] 2. Web domain configuration[1] From 271aed0cd12c2df11506337214676dd699ce6a80 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:56:05 -0500 Subject: [PATCH 28/34] Revert "#7 linux" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1cd5c4be..7834207f 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and #### Things we understand** 1. Oracle Cloud Instance set-up[1] 2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1] -3. Basic Linux BASH script commands (directory navigation, file creation, and text editing)[2] +3. Basic BASH script commands (directory navigation, file creation, and text editing)[1] #### Things we don't understand 1. Resolving merge conflicts with GitHub forks[2] 2. Web domain configuration[1] From 03fbdc8c2699b596504b38c4deca0ad0d95b3470 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:56:32 -0500 Subject: [PATCH 29/34] Revert "#6 customizing" --- README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7834207f..3492f7e2 100644 --- a/README.md +++ b/README.md @@ -13,21 +13,20 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and ### Our List: #### Things we understand** -1. Oracle Cloud Instance set-up[1] -2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration[1] -3. Basic BASH script commands (directory navigation, file creation, and text editing)[1] +1. Oracle Cloud Instance set-up [1] +2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration [1] +3. Basic BASH script commands (directory navigation, file creation, and text editing) [1] #### Things we don't understand -1. Resolving merge conflicts with GitHub forks[2] -2. Web domain configuration[1] -3. VM and Docker configuration customization[1] -4. Git Stash[1] -5. Difference between Docker container and Docker repository[1] +1. Resolving merge conflicts with GitHub forks [2] +2. Web domain configuration [1] +3. VM and Docker configuration customization [1] +4. Git Stash [1] +5. Difference between Docker container and Docker repository [1] #### Things we want to know next** -1. Host a website on Oracle Cloud from a GitHub repository[2] -2. Website content management[1] -3. Responsive web page design and development[1] +1. Host a website on Oracle Cloud from a GitHub repository [2] +2. Website content management [1] +3. Responsive web page design and development [1] 4. Increasing security on web server/web page[1] -5. Customizing parameters of docker-compose files[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 1ed74aefcda320a9898af4225e4a93bd7ab82ebf Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:57:34 -0500 Subject: [PATCH 30/34] Revert "#5 security" --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3492f7e2..d250db3d 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,11 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Web domain configuration [1] 3. VM and Docker configuration customization [1] 4. Git Stash [1] -5. Difference between Docker container and Docker repository [1] +5. Difference between Docker container and Docker repository[1] #### Things we want to know next** 1. Host a website on Oracle Cloud from a GitHub repository [2] 2. Website content management [1] 3. Responsive web page design and development [1] -4. Increasing security on web server/web page[1] ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL Add your ssh public key to github - See video From 9790e247726ada79448ab8ba069409d836b3d8d9 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:58:03 -0500 Subject: [PATCH 31/34] Revert "#4 how to host" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d250db3d..0f53cae6 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 4. Git Stash [1] 5. Difference between Docker container and Docker repository[1] #### Things we want to know next** -1. Host a website on Oracle Cloud from a GitHub repository [2] +1. Host a website on Oracle Cloud from a GitHub repository [1] 2. Website content management [1] 3. Responsive web page design and development [1] From 346fc7053fa0f4897a3a11c731f675ef1d55743e Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:58:41 -0500 Subject: [PATCH 32/34] Revert "#3 docker diff" --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0f53cae6..8026bfe5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Web domain configuration [1] 3. VM and Docker configuration customization [1] 4. Git Stash [1] -5. Difference between Docker container and Docker repository[1] #### Things we want to know next** 1. Host a website on Oracle Cloud from a GitHub repository [1] 2. Website content management [1] From 1950491b8940f2218ba3f060ce0ab832d5bd1975 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:59:07 -0500 Subject: [PATCH 33/34] Revert "#2 resolving merge" --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8026bfe5..763008e4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 2. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration [1] 3. Basic BASH script commands (directory navigation, file creation, and text editing) [1] #### Things we don't understand -1. Resolving merge conflicts with GitHub forks [2] +1. Resolving merge conflicts with GitHub forks [1] 2. Web domain configuration [1] 3. VM and Docker configuration customization [1] 4. Git Stash [1] From 6c49e805e3c87669ada5d6636157ab82e5b83bd4 Mon Sep 17 00:00:00 2001 From: ers34 <58746249+ers34@users.noreply.github.com> Date: Fri, 24 Feb 2023 22:59:31 -0500 Subject: [PATCH 34/34] Revert "#1 git stash" --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 763008e4..82498cb8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,6 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and 1. Resolving merge conflicts with GitHub forks [1] 2. Web domain configuration [1] 3. VM and Docker configuration customization [1] -4. Git Stash [1] #### Things we want to know next** 1. Host a website on Oracle Cloud from a GitHub repository [1] 2. Website content management [1]