Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
8c01f42
Update issue templates
vr62 Feb 20, 2023
c8ba805
added something to list
vr62 Feb 20, 2023
748b99b
Merge pull request #3 from vr62/2-something closes#2
vr62 Feb 20, 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
96449c5
Update issue templates
vr62 Feb 24, 2023
4567670
completed learning print in python
vr62 Feb 24, 2023
b1455fd
Merge pull request #5 from vr62/4-python-print closes #4
vr62 Feb 24, 2023
cd1a087
resolved
vr62 Feb 24, 2023
a508e03
added linux
vr62 Feb 24, 2023
d5bb069
Merge pull request #7 from vr62/6-linux-directory-listing closes#6
vr62 Feb 24, 2023
48ebf13
added python to list
vr62 Feb 24, 2023
9d2bd11
Merge pull request #10 from vr62/9-python
vr62 Feb 24, 2023
fbde9c4
added linux to the list
vr62 Feb 24, 2023
0f28f9e
Merge pull request #12 from vr62/11-linux closes#11
vr62 Feb 24, 2023
c20389d
added JS
vr62 Feb 24, 2023
53b06db
Merge pull request #14 from vr62/13-javascript closes#13
vr62 Feb 24, 2023
5abc8ae
added React
vr62 Feb 24, 2023
cd130dd
Merge pull request #16 from vr62/15-reactjs closes#15
vr62 Feb 24, 2023
6ed282e
added git stash to list
vr62 Feb 24, 2023
32b210f
Merge pull request #18 from vr62/17-git-stash closes#17
vr62 Feb 24, 2023
353c673
added github actions
vr62 Feb 24, 2023
7f21dcc
Merge pull request #21 from vr62/20-github-actions closes#20
vr62 Feb 24, 2023
cd9cbf1
added git merge
vr62 Feb 24, 2023
39644ca
Merge pull request #23 from vr62/22-git-merge closes#22
vr62 Feb 24, 2023
40c313a
added terraform
vr62 Feb 24, 2023
e3aeecc
Merge pull request #25 from vr62/24-terraform closes#24
vr62 Feb 24, 2023
84f4dc6
added AWS
vr62 Feb 24, 2023
0f45c5e
Merge pull request #27 from vr62/26-aws
vr62 Feb 24, 2023
65a7cca
added Jenkins
vr62 Feb 24, 2023
b387bb1
Merge pull request #29 from vr62/28-jenkins closes#28
vr62 Feb 24, 2023
33f3903
added Kubernetes
vr62 Feb 24, 2023
25a2f45
Merge pull request #31 from vr62/30-kubernetes closes#30
vr62 Feb 24, 2023
4bd6824
added python
NandiniPalwai19 Feb 24, 2023
61b67e7
Merge pull request #10 from NandiniPalwai19/1-python-print closes#1
NandiniPalwai19 Feb 24, 2023
f26b1f6
added linux
NandiniPalwai19 Feb 24, 2023
3f6468e
Merge pull request #11 from NandiniPalwai19/2-linux-directory-listing…
NandiniPalwai19 Feb 24, 2023
c702ccd
Update issue templates
RamyaKammari Feb 24, 2023
c7483b3
Added Docker
NandiniPalwai19 Feb 24, 2023
b88066d
Merge pull request #12 from NandiniPalwai19/3-docker-installation clo…
NandiniPalwai19 Feb 24, 2023
1a5a332
Added Git Stash
NandiniPalwai19 Feb 24, 2023
9631cc3
Merge pull request #13 from NandiniPalwai19/4-git-stash closes#4
NandiniPalwai19 Feb 24, 2023
cfa1090
Added Git Pull
NandiniPalwai19 Feb 24, 2023
8a5b1c8
Merge pull request #14 from NandiniPalwai19/5-git-pull closes#5
NandiniPalwai19 Feb 24, 2023
d6b17d8
Added Git Status
NandiniPalwai19 Feb 24, 2023
5174839
Merge pull request #15 from NandiniPalwai19/6-git-status closes#6
NandiniPalwai19 Feb 24, 2023
c7e6373
Added Elastic Search
NandiniPalwai19 Feb 24, 2023
421869d
Merge pull request #16 from NandiniPalwai19/7-elastic-search-indexing…
NandiniPalwai19 Feb 24, 2023
aaeb3c9
Added cloud
NandiniPalwai19 Feb 24, 2023
b95d979
Merge pull request #17 from NandiniPalwai19/8-cloud-deployment-with-k…
NandiniPalwai19 Feb 24, 2023
529767a
Added terraform
NandiniPalwai19 Feb 24, 2023
41d030f
Merge pull request #18 from NandiniPalwai19/9-terraform closes #9
NandiniPalwai19 Feb 24, 2023
4d0ac45
Incremented Python
NandiniPalwai19 Feb 25, 2023
556d040
Merge branch 'main' into 19-python
vr62 Feb 25, 2023
a45bbc4
Merge pull request #32 from NandiniPalwai19/19-python
vr62 Feb 25, 2023
ca62b17
Merge pull request #20 from NandiniPalwai19/19-python
NandiniPalwai19 Feb 25, 2023
9a8d75b
added python
vr62 Feb 25, 2023
9f3c6ad
Merge pull request #21 from vr62/33-python
NandiniPalwai19 Feb 25, 2023
62291dc
Revert "33 python"
NandiniPalwai19 Feb 25, 2023
1c83af7
Merge pull request #22 from NandiniPalwai19/revert-21-33-python
NandiniPalwai19 Feb 25, 2023
eb72fc1
added linux
vr62 Feb 25, 2023
db21a7d
added javascript
vr62 Feb 25, 2023
132cd08
raect
vr62 Feb 25, 2023
00be2dc
git stash
vr62 Feb 25, 2023
12909b0
gitactions
vr62 Feb 25, 2023
7cbda21
gitmerge
vr62 Feb 25, 2023
94361e4
teraform
vr62 Feb 25, 2023
3f3e257
aws
vr62 Feb 25, 2023
b1537f0
jenkins
vr62 Feb 25, 2023
59c9abf
kubes
vr62 Feb 25, 2023
68e8e60
kubes
vr62 Feb 25, 2023
91a3dc9
changes
NandiniPalwai19 Feb 25, 2023
9221e4b
docker
NandiniPalwai19 Feb 25, 2023
39d54ec
gitstash
NandiniPalwai19 Feb 25, 2023
d4268f6
Pull
NandiniPalwai19 Feb 25, 2023
bb0c221
status
NandiniPalwai19 Feb 25, 2023
3a5d3f2
elastic
NandiniPalwai19 Feb 25, 2023
b012fa7
cloud
NandiniPalwai19 Feb 25, 2023
f655a61
teraform
NandiniPalwai19 Feb 25, 2023
33e88f8
python
NandiniPalwai19 Feb 25, 2023
f029a0c
Merge pull request #32 from vr62/43-kubernetes
NandiniPalwai19 Feb 25, 2023
2ff683e
Merge pull request #44 from NandiniPalwai19/34-linux
vr62 Feb 25, 2023
f541be3
Merge branch 'main' into 42-jenkins
NandiniPalwai19 Feb 25, 2023
e67fdce
Merge pull request #31 from vr62/42-jenkins
NandiniPalwai19 Feb 25, 2023
8268640
Merge pull request #45 from NandiniPalwai19/35-docker
vr62 Feb 25, 2023
f624170
Merge branch 'main' into 41-aws
NandiniPalwai19 Feb 25, 2023
eb5a27c
Merge pull request #30 from vr62/41-aws
NandiniPalwai19 Feb 25, 2023
0cca676
Merge branch 'main' into 42-python
vr62 Feb 25, 2023
089095b
Merge pull request #46 from NandiniPalwai19/36-git-stash
vr62 Feb 25, 2023
e0493f8
Merge branch 'main' into 40-teraform
NandiniPalwai19 Feb 25, 2023
128fa10
Merge pull request #29 from vr62/40-teraform
NandiniPalwai19 Feb 25, 2023
4aae8a2
Merge branch 'main' into 37-git-pull
vr62 Feb 25, 2023
c787afa
Merge pull request #47 from NandiniPalwai19/37-git-pull
vr62 Feb 25, 2023
4c38842
Merge pull request #28 from vr62/39-git-merge
NandiniPalwai19 Feb 25, 2023
5a06df5
Merge pull request #48 from NandiniPalwai19/38-git-status
vr62 Feb 25, 2023
c023341
Merge pull request #49 from NandiniPalwai19/39-elastic
vr62 Feb 25, 2023
3038d88
Merge pull request #50 from NandiniPalwai19/40-cloud
vr62 Feb 25, 2023
7c03dae
Merge branch 'main' into 38-github-actions
NandiniPalwai19 Feb 25, 2023
83d75ad
Merge pull request #27 from vr62/38-github-actions
NandiniPalwai19 Feb 25, 2023
46be14a
Merge branch 'main' into 41-teraform
vr62 Feb 25, 2023
1be15f8
Merge pull request #51 from NandiniPalwai19/41-teraform
vr62 Feb 25, 2023
63b1710
Merge pull request #52 from NandiniPalwai19/42-python
vr62 Feb 25, 2023
8e62bf1
Merge branch 'main' into 37-git-stash
NandiniPalwai19 Feb 25, 2023
b450b3c
Merge pull request #26 from vr62/37-git-stash
NandiniPalwai19 Feb 25, 2023
b155b9d
Merge pull request #25 from vr62/36-react
NandiniPalwai19 Feb 25, 2023
b79eaad
Merge branch 'main' into 35-javascript
NandiniPalwai19 Feb 25, 2023
9a8366a
Merge pull request #24 from vr62/35-javascript
NandiniPalwai19 Feb 25, 2023
2c6d147
Merge branch 'main' into 33-python
NandiniPalwai19 Feb 25, 2023
a69e155
Merge pull request #23 from vr62/33-python
NandiniPalwai19 Feb 25, 2023
d3a8fa4
Kubes
vr62 Feb 25, 2023
be16a3c
Merge branch 'main' into 43-kubernetes
vr62 Feb 25, 2023
4cdceea
Merge pull request #53 from vr62/43-kubernetes
vr62 Feb 25, 2023
8880e9f
Merge branch 'main' into 40-cloud
NandiniPalwai19 Feb 25, 2023
3344ab3
Merge pull request #43 from NandiniPalwai19/40-cloud
NandiniPalwai19 Feb 25, 2023
4e20cc8
Merge branch 'main' into main
vr62 Feb 25, 2023
a28d76b
added docker to list
RamyaKammari Feb 25, 2023
f417d6d
Merge pull request #29 from RamyaKammari/2-docker
RamyaKammari Feb 25, 2023
fa52b49
added aws to list
RamyaKammari Feb 25, 2023
9708d69
Merge pull request #30 from RamyaKammari/3-aws closes #30
RamyaKammari Feb 25, 2023
a6b3a05
added tera form to list
RamyaKammari Feb 25, 2023
7e5254c
Merge pull request #31 from RamyaKammari/4-tera-form closes #31
RamyaKammari Feb 25, 2023
3ab16ac
added kubernetes to list
RamyaKammari Feb 25, 2023
12e18e9
Merge pull request #32 from RamyaKammari/5-kubernetes closes #32
RamyaKammari Feb 25, 2023
cdb31c4
added git status to list
RamyaKammari Feb 25, 2023
5b06ac2
Merge pull request #33 from RamyaKammari/6-git-status closes #33
RamyaKammari Feb 25, 2023
f9b22be
added git pull to list
RamyaKammari Feb 25, 2023
63362c8
Merge pull request #34 from RamyaKammari/7-git-pull closes #34
RamyaKammari Feb 25, 2023
8a0c5dc
added elastic search indexing to list
RamyaKammari Feb 25, 2023
5ade170
Merge pull request #35 from RamyaKammari/8-elastic-search-indexing cl…
RamyaKammari Feb 25, 2023
f7cba14
added linux to list
RamyaKammari Feb 25, 2023
bb413e4
Merge pull request #36 from RamyaKammari/9-linux-1 closes #36
RamyaKammari Feb 25, 2023
c9cf0b8
added git stash to list
RamyaKammari Feb 25, 2023
0091d71
Merge pull request #37 from RamyaKammari/10-git-stash-1 closes #37
RamyaKammari Feb 25, 2023
89e0c2d
Merge branch 'main' into RamyaKammari-main
NandiniPalwai19 Feb 25, 2023
8e79d8f
Merge pull request #47 from NandiniPalwai19/RamyaKammari-main
NandiniPalwai19 Feb 25, 2023
6bac6cc
all set
NandiniPalwai19 Feb 25, 2023
614deff
all done
NandiniPalwai19 Feb 25, 2023
38e305f
all set
NandiniPalwai19 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: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/bcs25.md

This file was deleted.

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

This file was deleted.

6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/completed-lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ 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: compiled list


assignees: ''

---

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

PULL REQUEST LINK:
Expand Down
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/master-list.md

This file was deleted.

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

name: Master pull request
about: This is for your master pull request to merge your master into this repo
title: Put your UCID as the title (replace the text)
labels: compiled list

about: This is for your master pull request to merge your master into this repo.
title: bcs25
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,8 +1,11 @@
---
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: ''


labels: Things I don't Understand

assignees: ''

---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
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]"
labels: ''
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: Things we want to know next
name: Things I want to know
about: Describe this issue template's purpose here.
title: 'Thing we want to know: <file in title> [Thing we want to Knows]'
labels: Thing we want to know next
title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
labels: ''
assignees: ''

---
Expand Down
10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/things-we-understand.md

This file was deleted.

59 changes: 23 additions & 36 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,37 @@ 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]
1. Python [2]
2. Linux[2]
3. JavaScript[2]
4. ReactJS[2]
5. i knew Docker[1]
6. i knew aws[1]
7. i knew tera form[1]
8. Docker[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. Git Stash[2]
2. GitHub Actions[1]
3. Git Merge[1]
4. Git pull[2]
5. Git Status[2]
6. i dont know kubernetes[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. Terraform[2]
2. AWS[1]
3. Jenkins[1]
4. Kubernetes[3]
5. Elastic Search Indexing[3]
6. Cloud Deployment[2]
7. i want to know linux [1]
8. i want to know git stash [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
Expand Down