Skip to content
Merged

cww7 #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
2eb18cf
Update issue templates
ers34 Feb 17, 2023
4e6bd45
Merge pull request #1 from ers34/ers34-patch-1
ers34 Feb 17, 2023
d073b86
Update things-i-don-t-understand.md
chwicklund Feb 22, 2023
a87d610
Update things-i-don-t-understand.md
chwicklund Feb 22, 2023
484b112
Update things-i-learned.md
chwicklund Feb 22, 2023
4a85750
Update things-i-want-to-know.md
chwicklund Feb 22, 2023
af02b14
Update things-i-learned.md
chwicklund Feb 22, 2023
c7a7758
Task: edited list
chwicklund Feb 24, 2023
6c4c396
Merge pull request #11 from chwicklund/1-git-stash
chwicklund Feb 24, 2023
494517e
Resolving merge conflicts on fork
chwicklund Feb 24, 2023
efdffb3
Merge pull request #12 from chwicklund/2-resolving-merge
chwicklund Feb 24, 2023
63c2d42
#3 Difference between Docker container and Docker repository
chwicklund Feb 24, 2023
91a1c55
Merge pull request #13 from chwicklund/3-docker-diff
chwicklund Feb 24, 2023
3c77e0a
#4 How to host a website on Oracle Cloud from a Github repo
chwicklund Feb 24, 2023
52f8095
Merge pull request #14 from chwicklund/4-how-to-host
chwicklund Feb 24, 2023
75b6610
#5 Increasing security on web server/web page
chwicklund Feb 24, 2023
5c7ebb7
Merge pull request #15 from chwicklund/5-security
chwicklund Feb 24, 2023
9c53540
#6 Customizing parameters of docker-compose files
chwicklund Feb 24, 2023
b5dea19
Merge pull request #16 from chwicklund/6-customizing
chwicklund Feb 24, 2023
f582615
#7 Linux Directory Navigation
chwicklund Feb 24, 2023
347efed
Merge pull request #17 from chwicklund/7-linux
chwicklund Feb 24, 2023
3c5c061
#8 Running Docker Compose
chwicklund Feb 24, 2023
62f6c52
Merge pull request #18 from chwicklund/8-running
chwicklund Feb 24, 2023
b58d6d1
#9 Installing NPM
chwicklund Feb 24, 2023
5dc1fc9
Merge pull request #19 from chwicklund/9-npm
chwicklund Feb 24, 2023
d30ebbd
Update issue templates (add master list label)
ers34 Feb 25, 2023
2dfe36a
Merge pull request #2 from ers34/ers34-patch-2
ers34 Feb 25, 2023
d7bcb4b
added first 'do not understand' item to list
Feb 25, 2023
dbdf82d
Merge pull request #4 from ers34/3-resolving-merge-conflicts-with-git…
ers34 Feb 25, 2023
8b560ff
add second 'don't understand' item to list
Feb 25, 2023
27a84bb
Merge pull request #6 from ers34/5-web-domain-configuration-1 closes #5
ers34 Feb 25, 2023
76627f6
add third 'don't understand' item to list
Feb 25, 2023
e7ee688
Merge pull request #8 from ers34/7-vm-and-docker-configuration-custom…
ers34 Feb 25, 2023
55d9ba8
add first 'understand' item to list
Feb 25, 2023
68eba4f
Merge pull request #10 from ers34/9-oracle-cloud-instance-set-up-1 cl…
ers34 Feb 25, 2023
95d3003
add second 'understand' item to list
Feb 25, 2023
6836f29
Merge pull request #12 from ers34/11-adding-reverse-proxy-load-balanc…
ers34 Feb 25, 2023
b59fbb5
add third 'understand' item to list
Feb 25, 2023
6c9a8a1
Merge pull request #14 from ers34/13-basic-bash-script-commands close…
ers34 Feb 25, 2023
511fb9f
add first 'want to know' item to list
Feb 25, 2023
8a71e3a
Merge pull request #16 from ers34/15-host-a-website-on-oracle-cloud-f…
ers34 Feb 25, 2023
5a26148
add second 'want to know' item to list
Feb 25, 2023
146500d
Merge pull request #18 from ers34/17-website-content-management-1 clo…
ers34 Feb 25, 2023
cbceec1
add third 'want to know' item to list
Feb 25, 2023
d8443b9
Merge branch 'main' into 3-resolving-merge-conflicts-with-github-forks-1
chwicklund Feb 25, 2023
3f2ce93
Merge pull request #20 from ers34/3-resolving-merge-conflicts-with-gi…
chwicklund Feb 25, 2023
2386000
Merge branch 'main' into 5-web-domain-configuration-1
chwicklund Feb 25, 2023
6355597
Merge pull request #21 from ers34/5-web-domain-configuration-1
chwicklund Feb 25, 2023
fd5cfd0
Merge branch 'main' into 7-vm-and-docker-configuration-customization-1
chwicklund Feb 25, 2023
7134564
Merge pull request #22 from ers34/7-vm-and-docker-configuration-custo…
chwicklund Feb 25, 2023
d77a7de
Merge branch 'main' into 9-oracle-cloud-instance-set-up-1
chwicklund Feb 25, 2023
fbba16d
Merge pull request #23 from ers34/9-oracle-cloud-instance-set-up-1
chwicklund Feb 25, 2023
8fc394e
Merge branch 'main' into 11-adding-reverse-proxy-load-balancer-traefi…
chwicklund Feb 25, 2023
b00816a
Merge pull request #24 from ers34/11-adding-reverse-proxy-load-balanc…
chwicklund Feb 25, 2023
3f6fd0a
Merge branch 'main' into 13-basic-bash-script-commands
chwicklund Feb 25, 2023
21bcfff
Merge pull request #25 from ers34/13-basic-bash-script-commands
chwicklund Feb 25, 2023
592ae1a
Merge branch 'main' into 15-host-a-website-on-oracle-cloud-from-a-git…
chwicklund Feb 25, 2023
121b239
Merge pull request #26 from ers34/15-host-a-website-on-oracle-cloud-f…
chwicklund Feb 25, 2023
8e56269
Merge branch 'main' into 17-website-content-management-1
chwicklund Feb 25, 2023
f094665
Merge pull request #27 from ers34/17-website-content-management-1
chwicklund Feb 25, 2023
89fc28e
Merge branch 'main' into 19-responsive-web-page-design-and-development-1
chwicklund Feb 25, 2023
b20b13c
Merge pull request #28 from ers34/19-responsive-web-page-design-and-d…
chwicklund Feb 25, 2023
4dc0565
Update README.md
chwicklund Feb 25, 2023
0f8cd73
Merge branch 'complete_list' into main
aleeshaneha09 Mar 5, 2023
88a8361
Merge branch 'complete_list' into main
aleeshaneha09 Mar 5, 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
9 changes: 8 additions & 1 deletion .github/ISSUE_TEMPLATE/completed-lists.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ labels: Compiled list

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


labels: master list
=======
labels: Master List
=======

labels: Master List

assignees: ''
Expand All @@ -30,4 +36,5 @@ labels: Master List

UCID: ps277
=======
assignees: ''
assignees: ''

7 changes: 7 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-don-t-understand.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
name: Things I Don't Understand

about: This is for adding issues that you don't understand
title: (Thing I Don't Understand)
labels: idk
=======
about: This is for adding issues that you don't understand.
title: ''

Expand All @@ -22,6 +27,8 @@ labels: Things i don't understand

labels: don't understand

=======

assignees: ''
=======

Expand Down
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-learned.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@


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 know
=======

=======


Expand Down Expand Up @@ -57,4 +65,5 @@ assignees: ''




assignees: ''
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/things-i-want-to-know.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@

name: Things I want to know
about: Describe something you want to learn.
title: '(Thing I want to know)'
labels: i wanna learn
=======
=======

=======


Expand All @@ -17,6 +24,10 @@ about: Add one item for each thing you want to know.
title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
labels: want to know


assignees: ''
=======

assignees: ''
=======
=======
Expand All @@ -43,3 +54,4 @@ labels: want to know
assignees: ''
=======


23 changes: 21 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
### Our List:
#### Things we understand
1. Basic BASH script commands (directory navigation, file creation, and text editing)[2]
2. Running Docker Compose[1]
3. Installing NPM[1]
4. Oracle Cloud Instance set-up [1]
5. Adding reverse proxy load balancer (Traefik) to VM with Docker configuration [1]
#### Things we don't understand
1. Git Stash[1]
2. Resolving merge conflicts with GitHub forks [2]
3. Difference between Docker container and Docker repository[1]
4. Web domain configuration [1]
5. VM and Docker configuration customization [1]
#### Things we want to know next
1. Host a website on Oracle Cloud from a GitHub repository [2]
2. Increasing security on web server/web page[1]
3. Customizing parameters of docker-compose files[1]
4. Website content management [1]
5. Responsive web page design and development [1]


=======
=======

#### Things we understand**

Expand Down Expand Up @@ -70,6 +88,7 @@
11. Create new branch and merge within my own repo[1]



#### Things we don't understand
1. Cloud deployment with Kubernetes[3]

Expand Down