Skip to content
Merged
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2d135eb
Merge pull request #4 from SarangAP/3-avoiding-merge-conflicts closes #3
SarangAP Feb 21, 2023
a7863b7
addition to don't understand
SarangAP Feb 21, 2023
a41514f
Merge pull request #6 from SarangAP/5-github-classroom closes #5
SarangAP Feb 21, 2023
5d56828
last addition to don't understand
SarangAP Feb 21, 2023
098849c
Merge pull request #8 from SarangAP/7-things-i-dont-understand-docker…
SarangAP Feb 21, 2023
fc4d7e9
addition to what i learned
SarangAP Feb 21, 2023
50ce48c
Docker issue
ericcchuang Feb 22, 2023
af82a2a
Watchtower
ericcchuang Feb 22, 2023
406ef99
javascript
ericcchuang Feb 22, 2023
709c566
github classroom
ericcchuang Feb 22, 2023
229f216
docker commands
ericcchuang Feb 22, 2023
5d34adf
PHP
ericcchuang Feb 22, 2023
a23aaf1
host a website
ericcchuang Feb 22, 2023
8d24c53
localhost
ericcchuang Feb 22, 2023
c42f4ed
linux terminal
ericcchuang Feb 22, 2023
0d73c04
Merge pull request #23 from eyh3/4-things-i-dont-understand-docker
ericcchuang Feb 22, 2023
5822f97
Merge pull request #24 from eyh3/5-things-i-dont-understand-watchtower
ericcchuang Feb 22, 2023
d5f4b40
Merge pull request #25 from eyh3/10-thing-i-want-to-know-host-a-websi…
ericcchuang Feb 22, 2023
4426c7d
Merge branch 'main' into 9-thing-i-want-to-know-php
ericcchuang Feb 22, 2023
6335636
Merge pull request #26 from eyh3/9-thing-i-want-to-know-php
ericcchuang Feb 22, 2023
b9ab807
Merge pull request #27 from eyh3/8-things-i-learned-docker-commands
ericcchuang Feb 22, 2023
4a4f0bf
Merge branch 'main' into 7-things-i-learned-github-classroom
ericcchuang Feb 22, 2023
ac5e24c
Merge pull request #28 from eyh3/7-things-i-learned-github-classroom
ericcchuang Feb 22, 2023
641eb28
Merge branch 'main' into 6-thing-i-want-to-know-javascript
ericcchuang Feb 22, 2023
ab752cb
Merge pull request #29 from eyh3/6-thing-i-want-to-know-javascript
ericcchuang Feb 22, 2023
3a9eb25
Merge branch 'main' into 11-things-i-learned-how-to-host-on-localhost
ericcchuang Feb 22, 2023
01879e6
Merge pull request #30 from eyh3/11-things-i-learned-how-to-host-on-l…
ericcchuang Feb 22, 2023
1582d80
Merge branch 'main' into 12-things-i-dont-understand-linux-terminal
ericcchuang Feb 22, 2023
fcaea03
Merge pull request #31 from eyh3/12-things-i-dont-understand-linux-te…
ericcchuang Feb 22, 2023
6786d11
Docker 2
ericcchuang Feb 22, 2023
0ab6674
Merge branch 'main' into 4-things-i-dont-understand-docker
ericcchuang Feb 22, 2023
91f7199
Merge pull request #32 from eyh3/4-things-i-dont-understand-docker
ericcchuang Feb 22, 2023
95612ce
Merge branch 'main' into 5-github-classroom
SarangAP Feb 22, 2023
287ad72
Merge pull request #22 from SarangAP/5-github-classroom
SarangAP Feb 22, 2023
e40b6e1
Merge branch 'main' into 7-things-i-dont-understand-dockerhub-integra…
SarangAP Feb 22, 2023
5be958c
Merge pull request #33 from SarangAP/7-things-i-dont-understand-docke…
SarangAP Feb 22, 2023
d12d4e3
Merge branch 'main' into 9-docker-containers
SarangAP Feb 22, 2023
fe2e60a
Modifying formatting
SarangAP Feb 23, 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
27 changes: 18 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,26 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and

### Your list should look like this:
#### Things we understand**
1. Python Print[1]
2. Linux Directory listing[2]
3. Docker Installation[1]

1. How to use GitHub Classroom[1]
2. How to use Docker commands[1]
3. How to host a website using localhost[1]
4. Docker containers [1]

#### Things we don't understand
1. How to avoid merge conflicts
2. GIt pull[2]
3. GIT status[1]


1. What is the purpose of Docker??[1]
2. Watchtower on docker? What is it? [1]
3. What is the point of Linux Terminal over Windows?[1]
4. Github Classroom[1]
5. Dockerhub integration[1]


#### Things we want to know next**
1. Elastic Search Indexing [1]
2. Cloud deployment with Kubernetes[2]
3. Teraform[1]
1. How to program using JavaScript [1]
2. How to program with PHP[1]
3. How to host a website without Github Pages[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