Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
4bbdca5
Update issue templates
sathvikareddyg Feb 20, 2023
1ed0694
added something to list
sathvikareddyg Feb 21, 2023
ca05407
Merge pull request #3 from sathvikareddyg/1-i-dont-know-how-to-do-any…
sathvikareddyg Feb 21, 2023
9079aaa
added something
sathvikareddyg Feb 21, 2023
c44b00c
Merge pull request #4 from sathvikareddyg/2-something closes #2
sathvikareddyg Feb 21, 2023
ec83353
Merge pull request #128 from jidone7061/main
kaw393939 Feb 22, 2023
c57e4eb
Revert "Merge pull request #128 from jidone7061/main"
kaw393939 Feb 22, 2023
dc260b0
added issue to i don't understand
navyarangu13 Feb 23, 2023
7932c86
Merge pull request #2 from navyarangu13/1-auto-grading closes #1
navyarangu13 Feb 23, 2023
c3a1957
Update issue templates
koushik-27 Feb 23, 2023
ac44199
Update issue templates
Joseph2810 Feb 23, 2023
d144ace
added Git merge
Feb 23, 2023
6698794
added to I want to know
navyarangu13 Feb 23, 2023
4284d7e
Merge pull request #12 from navyarangu13/11-thing-i-want-to-know-java…
navyarangu13 Feb 23, 2023
240263f
added to things I want to know
navyarangu13 Feb 23, 2023
dc6d9d0
Merge pull request #13 from navyarangu13/10-thing-i-want-to-know-reso…
navyarangu13 Feb 23, 2023
12f3fc7
added things I want to know
navyarangu13 Feb 23, 2023
0785400
added git usage on command line
koushik-27 Feb 23, 2023
53660df
Merge pull request #14 from navyarangu13/9-thing-i-want-to-know-web-p…
navyarangu13 Feb 23, 2023
a46866a
Merge pull request #3 from koushik-27/2-things-i-learned-2 closes #2
koushik-27 Feb 23, 2023
4d7cab9
Merge pull request #2 from Joseph2810/1-things-i-dont-understand-1 cl…
Joseph2810 Feb 23, 2023
181444e
added things I know
navyarangu13 Feb 23, 2023
1d635d6
Merge pull request #15 from navyarangu13/8-i-know-how-github-and-pych…
navyarangu13 Feb 23, 2023
78c4355
added things i know
navyarangu13 Feb 23, 2023
4afca70
I don't understand how to resolve merge conflicts
sathvikareddyg Feb 23, 2023
299d03f
Merge pull request #16 from navyarangu13/7-i-know-building-image-on-d…
navyarangu13 Feb 23, 2023
c28c3e6
added i know
navyarangu13 Feb 23, 2023
c1e2592
added How to resolve a daemon issue
Feb 23, 2023
cb94b10
Merge pull request #15 from sathvikareddyg/6-things-i-dont-understand…
sathvikareddyg Feb 23, 2023
45dec6e
Merge pull request #17 from navyarangu13/6-i-know-github-commands clo…
navyarangu13 Feb 23, 2023
e448ff2
Merge pull request #4 from Joseph2810/3-things-i-dont-understand-2 cl…
Joseph2810 Feb 23, 2023
e1f8c22
added collaborating on GHub
koushik-27 Feb 23, 2023
e21c2e7
Merge pull request #5 from koushik-27/4-things-i-learned-3 closes #4
koushik-27 Feb 23, 2023
a337241
I don't understand Docker container images and their use
sathvikareddyg Feb 23, 2023
244d1c5
Added things I don't understand 2
sathvikareddyg Feb 23, 2023
4db1a40
added Git Stash
Feb 23, 2023
552d838
Merge branch 'main' into 7-things-i-dont-understand-2
sathvikareddyg Feb 23, 2023
dbf92bb
Merge pull request #6 from Joseph2810/5-things-i-dont-understand-3 cl…
Joseph2810 Feb 23, 2023
ab02bbb
Merge pull request #17 from sathvikareddyg/7-things-i-dont-understand…
sathvikareddyg Feb 23, 2023
40c5e8d
added port issues on docker
koushik-27 Feb 23, 2023
534e145
added i don't understand
navyarangu13 Feb 23, 2023
b156b43
Merge pull request #18 from navyarangu13/5-i-dont-understand-git-hub-…
navyarangu13 Feb 23, 2023
f049750
Merge pull request #7 from koushik-27/6-dont-understand closes #6
koushik-27 Feb 23, 2023
a879529
added i don't understand
navyarangu13 Feb 23, 2023
fd630e7
Merge pull request #19 from navyarangu13/3-i-dont-understand-terminal…
navyarangu13 Feb 23, 2023
2736061
added Docker Installation
Feb 23, 2023
055c3e6
Merge pull request #8 from Joseph2810/7-things-i-learned-1 closes #7
Joseph2810 Feb 23, 2023
b40e941
added issue
sathvikareddyg Feb 23, 2023
f0c9eff
added pull requests on GHub
koushik-27 Feb 23, 2023
0daf0ce
Merge pull request #18 from sathvikareddyg/7-things-i-dont-understand…
sathvikareddyg Feb 23, 2023
9bd6924
Merge pull request #9 from koushik-27/8-dont-understand closes #8
koushik-27 Feb 23, 2023
8273bf4
added we dont understand
sathvikareddyg Feb 23, 2023
a95f84f
added git push and pull
Feb 23, 2023
1759a6c
added watchtower
koushik-27 Feb 23, 2023
9cc9e75
Merge pull request #10 from Joseph2810/9-things-i-learned-2 closes#9
Joseph2810 Feb 23, 2023
05f1664
added things I don't understand 3
sathvikareddyg Feb 23, 2023
bc71c42
Merge pull request #11 from koushik-27/10-dont-understand closes #10
koushik-27 Feb 23, 2023
22d71ab
added Building Docker image
Feb 23, 2023
b590e1a
Merge branch 'main' into 8-things-i-dont-understand-3
sathvikareddyg Feb 23, 2023
b5cefcf
Merge pull request #12 from Joseph2810/11-things-i-learned closes#11
Joseph2810 Feb 23, 2023
4d2a429
Merge pull request #19 from sathvikareddyg/8-things-i-dont-understand…
sathvikareddyg Feb 23, 2023
bd0be06
added working with Vi
koushik-27 Feb 23, 2023
857070e
Merge pull request #13 from koushik-27/12-thing-i-want-to-know-vi clo…
koushik-27 Feb 23, 2023
03235c8
added Automated Tests
Feb 23, 2023
034b749
updated count of Kubernetes
koushik-27 Feb 23, 2023
051502a
Merge pull request #14 from Joseph2810/13-thing-i-want-to-know-file-i…
Joseph2810 Feb 23, 2023
674fe96
Merge pull request #15 from koushik-27/14-thing-i-want-to-know-kubern…
koushik-27 Feb 23, 2023
30f4b91
removed spaces
sathvikareddyg Feb 23, 2023
89df3af
Added Things I learned 1
sathvikareddyg Feb 23, 2023
88074ac
added Devops
Feb 23, 2023
92ba726
Merge pull request #20 from sathvikareddyg/9-things-i-learned-1 close…
sathvikareddyg Feb 23, 2023
05cd007
Merge pull request #16 from Joseph2810/15-thing-i-want-to-know-file-i…
Joseph2810 Feb 23, 2023
cc3faa1
added webpack
koushik-27 Feb 23, 2023
8167aa6
Merge pull request #17 from koushik-27/16-thing-i-want-to-know-webpac…
koushik-27 Feb 23, 2023
c5c4137
added Webpage
Feb 23, 2023
0b86317
Added in main
sathvikareddyg Feb 23, 2023
152fe0a
Added things in learned 3
sathvikareddyg Feb 23, 2023
a00303c
updated the count of docker installation
koushik-27 Feb 23, 2023
54fd567
Merge pull request #20 from koushik-27/19-things-i-learned-1 closes #19
koushik-27 Feb 23, 2023
5c324b7
Merge branch 'main' into 11-things-i-learned-3
sathvikareddyg Feb 23, 2023
6f0e5d2
Merge pull request #22 from sathvikareddyg/11-things-i-learned-3 clos…
sathvikareddyg Feb 23, 2023
143d8a2
Added things I want to know 1
sathvikareddyg Feb 23, 2023
067d673
Merge pull request #23 from sathvikareddyg/12-things-i-want-to-know-1…
sathvikareddyg Feb 23, 2023
35063f1
Added things I learned 2
sathvikareddyg Feb 23, 2023
6b7c3eb
Merge branch 'main' into 13-things-i-want-to-know-2
sathvikareddyg Feb 24, 2023
5e8f8dd
Merge pull request #24 from sathvikareddyg/13-things-i-want-to-know-2…
sathvikareddyg Feb 24, 2023
ac48c74
things I want to know 3
sathvikareddyg Feb 24, 2023
0a9e420
Merge branch 'main' into 14-things-i-want-to-know-3
sathvikareddyg Feb 24, 2023
1fbb246
Merge pull request #25 from sathvikareddyg/14-things-i-want-to-know-3…
sathvikareddyg Feb 24, 2023
823fa3f
Added things I understand 2
sathvikareddyg Feb 24, 2023
452560b
Merge pull request #27 from sathvikareddyg/26-things-i-understand-2 c…
sathvikareddyg Feb 24, 2023
6ee6f54
added changes
sathvikareddyg Feb 24, 2023
9017e04
added changes
sathvikareddyg Feb 24, 2023
cbb9963
added changes
sathvikareddyg Feb 24, 2023
e736a51
added changes
sathvikareddyg Feb 24, 2023
7022217
Merge branch 'main' into 14-things-i-want-to-know-3
sathvikareddyg Feb 24, 2023
0187726
Merge pull request #28 from sathvikareddyg/14-things-i-want-to-know-3…
sathvikareddyg Feb 24, 2023
069daae
Merge branch 'main' into 13-things-i-want-to-know-2
sathvikareddyg Feb 24, 2023
154eefa
Merge pull request #29 from sathvikareddyg/13-things-i-want-to-know-2…
sathvikareddyg Feb 24, 2023
1028f51
Merge branch 'main' into 11-things-i-learned-3
sathvikareddyg Feb 24, 2023
1f2fce5
Merge pull request #30 from sathvikareddyg/11-things-i-learned-3 clos…
sathvikareddyg Feb 24, 2023
e874894
Merge branch 'main' into 26-things-i-understand-2
sathvikareddyg Feb 24, 2023
e510168
Merge branch 'main' into 6-things-i-dont-understand-1
navyarangu13 Feb 24, 2023
60ff460
Merge pull request #20 from sathvikareddyg/6-things-i-dont-understand-1
navyarangu13 Feb 24, 2023
36718e4
Merge branch 'main' into 7-things-i-dont-understand-2
navyarangu13 Feb 24, 2023
652ef0a
Merge pull request #21 from sathvikareddyg/7-things-i-dont-understand-2
navyarangu13 Feb 24, 2023
3142ec9
Merge pull request #22 from sathvikareddyg/8-things-i-dont-understand-3
navyarangu13 Feb 24, 2023
15137b7
Merge branch 'main' into 26-things-i-understand-2
navyarangu13 Feb 24, 2023
502f00e
Merge pull request #28 from sathvikareddyg/26-things-i-understand-2
navyarangu13 Feb 24, 2023
4ff5527
Merge branch 'main' into 1-things-i-dont-understand-1
koushik-27 Feb 24, 2023
170097b
Merge pull request #21 from Joseph2810/1-things-i-dont-understand-1
koushik-27 Feb 24, 2023
b9983b5
Merge branch 'main' into 3-things-i-dont-understand-2
koushik-27 Feb 24, 2023
1d4672b
Merge pull request #22 from Joseph2810/3-things-i-dont-understand-2
koushik-27 Feb 24, 2023
f24f5e1
Merge pull request #23 from Joseph2810/5-things-i-dont-understand-3
koushik-27 Feb 24, 2023
4d3bcf1
Merge branch 'main' into 7-things-i-learned-1
koushik-27 Feb 24, 2023
8663c59
Merge pull request #24 from Joseph2810/7-things-i-learned-1
koushik-27 Feb 24, 2023
d88ebcb
Merge branch 'main' into 9-things-i-learned-2
koushik-27 Feb 24, 2023
bd78622
Merge pull request #25 from Joseph2810/9-things-i-learned-2
koushik-27 Feb 24, 2023
07f9353
Merge branch 'main' into 11-things-i-learned
koushik-27 Feb 24, 2023
602bc92
Merge pull request #26 from Joseph2810/11-things-i-learned
koushik-27 Feb 24, 2023
0d71e91
Merge branch 'main' into 13-thing-i-want-to-know-file-in-title-thing-…
koushik-27 Feb 24, 2023
2b64d0d
Merge pull request #27 from Joseph2810/13-thing-i-want-to-know-file-i…
koushik-27 Feb 24, 2023
7a02716
Merge branch 'main' into 15-thing-i-want-to-know-file-in-title-thing-…
koushik-27 Feb 24, 2023
4c8a17d
Merge pull request #28 from Joseph2810/15-thing-i-want-to-know-file-i…
koushik-27 Feb 24, 2023
7d3eae4
Merge branch 'main' into 17-thing-i-want-to-know-file-in-title-thing-…
koushik-27 Feb 24, 2023
b2ab80f
Merge pull request #29 from Joseph2810/17-thing-i-want-to-know-file-i…
koushik-27 Feb 24, 2023
cde510b
Revert "7 things i learned 1"
koushik-27 Feb 24, 2023
9464f8d
Merge pull request #30 from koushik-27/revert-24-7-things-i-learned-1
koushik-27 Feb 24, 2023
37e75bb
Update README.md
koushik-27 Feb 24, 2023
9e3534e
Update issue templates
koushik-27 Feb 24, 2023
d27b167
Update issue templates
navyarangu13 Feb 25, 2023
4442423
updated the list
navyarangu13 Feb 25, 2023
46be59f
updated the issues
navyarangu13 Feb 25, 2023
f131597
resolved conflicts in main branch merge
navyarangu13 Feb 25, 2023
371931b
Merge branch 'koushik-27-main'
navyarangu13 Feb 25, 2023
47ed2bd
Update issue templates
navyarangu13 Feb 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/assignment-master-list.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Assignment master list
about: merging my master with another person's master
title: ''
labels: ''
assignees: ''

---


10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/complete-list.md

This file was deleted.

10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/completed-list.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Completed List
about: completed the isssues
title: ''
labels: ''
assignees: ''

---


13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/completed-lists.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/master-list.md

This file was deleted.

11 changes: 5 additions & 6 deletions .github/ISSUE_TEMPLATE/master-pull-request.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
---
name: Master Pull Request


about: This is for your master pull request to merge your master into this repo.
title: bcs25

title: Put your UCID as the title(replace this text)
labels: ''
assignees: ''

---

You need to make a pull request snd add the link to the pull request to the issue when you submit.

You need to make a pull request and add the link to the pull request to this issue when you submit.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Things we don't understand
name: Things I Don't Understand
about: This is for adding issues that you don't understand
title: ''
labels: ''
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Things I know
name: Things I learned
about: Add one item for each thing you learned keep to max of 255 characters
title: "[Things I Learned]"
title: ''
labels: ''
assignees: ''

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: bcs25
name: Things I want to know
about: Describe this issue template's purpose here.
title: ''
labels: ''
assignees: ''

---


Please describe what you want to know in less than 255 characters.
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-understand.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-want-to-know-next.md

This file was deleted.

77 changes: 41 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,60 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
2. You will learn to merge pull requests and resolve merge conflicts
3. You will learn to manage a basic project using GitHub Project.

### 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 prioritize each issue.
### 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. git status [1]
2. git fetch [1]
3. git checkout [1]
4. Docker Setup[4]
5. Linux command[1]
6. I learned Python Pytest[1]
7. Create new branch and merge within my own repo[1]
8. Cloning Repository[2]
9. Python is integrated into pycharm[1]
10. Pycharm and Github workflow and integration process[1]
11. Create new branch and merge within my own repo[1]
#### Things we understand**
1. I learned Git issues[1]
2. I learned Git status[1]
3. Docker Installation[4]
4. GitHub and PyCharm work[1]
5. Building image on Docker[1]
6. GitHub commands[1]
7. Python Print[1]
8. Linux Directory listing[2]
9. Git push and pull[1]
10. Building Docker Image [1]
11. Using Git on command line[1]
12. Collaborating on GitHub[1]

#### Things we don't understand
1. Clarity on who Merges a pull request [1]
2. Difference between Docker build & Docker compose [1]
3. How docker pushes to dockerhub [1]
4. Git rebase Usage[1]
5. Git Stash Usage[1]
6. Git show Usage[1]
7. Undo specific git commit or git push[2]
8. Git Pull[2]
9. Docker Storage space limitation[2]
10. dockerization[1]
11. Git Push[1]
12. Teraform[1]
12. Cloud deployment with Kubernetes[1]
1. I don't understand how to resolve merge conflicts[1]
2. I don't understand Docker container images and their use[1]
3. I don't know how to deal with daemon errors[2]
4. Auto grading[1]
5. gitHub commit and push[1]
6. Terminal Errors[1]
7. Git Stash[2]
8. GIt pull[2]
9. GIT status[1]
10. Git merge[1]
11. port issues on docker[1]
12. pull requests on GHub[1]
13. Watchtower[1]


#### Things we want to know next**
1. How to better work as a PM or as a subordinate [1]
2. Use Python program to write Hello World [1]
3. How Dockerhub pushes or uses resources against repos in scalable way [1]
4. How to deploy a web app with a database on the cloud [1]
5. Cloud deployment with Kubernetes[3]
6. Teraform Usage[3]
7. Elastic Search Indexing[3]
8. Security within our Github and Docker workflow[1]
9. Linux Directory Listings[1]
1. I want to know about CI/CD tools[1]
2. I want to know Git remote repositories[1]
3. cloud deployment with kubernetes[4]
4. Resolving Errors[1]
5. Web project using HTML, CSS, JavaScript[2]
6. Elastic Search Indexing [1]
7. Teraform[1]
8. How write Automated Tests [1]
9. Devops[1]
10. How to create a webpage[1]
11. Working with Vi[1]
12. Webpack[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
**open powershell or terminal and run "ssh-keygen -b 4096" and hit enter through the prompts and then open the file **your home directory/.ssh/id_rsa.pub** and copy that text into your github account settings under SSH/GPG keys -> add key. in one of the prompts it will tell you where it is going to save the key. If you already have a key reusue the one you have and cancel out of the process with control c **. I do it on my mac with the command vi ~/.ssh/id_rsa.pub" and then i press shift colon : and q to quit



### [Assignment Video](https://youtu.be/UFLKojO3OtM)

## You will accomplish this assignment in 5 phases:
Expand Down