Skip to content

Chan #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sathvikareddyg wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Chan #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d05de07
chnaged file names
bhogeswari05 Feb 15, 2023
ca01954
chnaged title
bhogeswari05 Feb 15, 2023
d0c9e09
Merge pull request #1 from navyarangu13/cloning
bs227 Feb 15, 2023
1c57a29
docker
navyarangu13 Feb 15, 2023
63dcd34
docker change
navyarangu13 Feb 15, 2023
f534d4d
added names
navyarangu13 Feb 15, 2023
ee970cc
chnages
navyarangu13 Feb 15, 2023
4ff86da
added
navyarangu13 Feb 15, 2023
efd93c7
added
navyarangu13 Feb 15, 2023
5450de4
changes done
navyarangu13 Feb 15, 2023
9d8d06a
added header name
navyarangu13 Feb 15, 2023
4c061d1
Merge pull request #2 from navyarangu13/slave
navyarangu13 Feb 15, 2023
2adcdfe
changes done in another branch
navyarangu13 Feb 15, 2023
c1768cd
Merge pull request #3 from navyarangu13/slave2
navyarangu13 Feb 15, 2023
1bf3f71
made changes to chan
sathvikareddyg Feb 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- 'v*'

env:
DOCKER_REPO_NAME: kaw393939/mywebclass-practice
DOCKER_REPO_NAME: navyarangu/mywebclass-practice

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FROM httpd:2.4
COPY ./public_html/ /usr/local/apache2/htdocs/

28 changes: 8 additions & 20 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,25 @@
version: "3.8"

services:
master_branch:
image: kaw393939/mywebclass:master
container_name: master_branch
master:
image: navyarangu/mywebclass:master
deploy:
replicas: 2
pull_policy: always
restart: always
ports:
- "80:80"
- "80-81:80"
labels:
- 'com.centurylinklabs.watchtower.enable=true'
development_branch:
image: kaw393939/mywebclass:development
container_name: development_branch
pull_policy: always
restart: always
ports:
- "8000:80"
labels:
- 'com.centurylinklabs.watchtower.enable=true'
local_public_html_build:
development:
build: .
container_name: local_public_html_build
container_name: development
pull_policy: always
restart: always
ports:
- "8080:80"
volumes:
- ./public_html/:/usr/local/apache2/htdocs/
local_app_build:
build: ./app
container_name: app
volumes:
- ./requirements.txt:/home/myuser/requirements.txt
watchtower:
image: containrrr/watchtower
container_name: watchtower
Expand Down
10 changes: 5 additions & 5 deletions myinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"first_name": "change",
"last_name": "change",
"ucid": "change",
"github_id": "change",
"docker_id": "kaw393939"
"first_name": "navya",
"last_name": "rangu",
"ucid": "nr528",
"github_id": "navyarangu13",
"docker_id": "navyarangu"

}
5 changes: 3 additions & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ theirs. The end result is that each partner should have the experience of the te

### 3. Both Partners ACCEPT THE Assignment GITHUB to create their own GitHub repo, so each person has the chance to do all the steps and practice makes perfect...

1. Partner 1: [kwilliam](https://github.com/kaw393939) <-change to you or your partner
2. Partner 2: [kwilliam](https://github.com/kaw393939) <-change to you or your partner

1. Partner 1: [sathvika](https://github.com/sathvikareddyg) <-change to you or your partner
2. Partner 2: [bhogeswari](https://github.com/bs227) <-change to you or your partner
3. Partner 3: Optional

Complete this on each partner's repos for this assignment by following the development workflow process bellow. Since
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

<!--Basic meta info -->
<meta name="keywords" content="My Webclass Homepage">
<meta name="keywords" content="My Webclasses">
<meta name="author" content="Keith Williams" />
<meta name="description" content="A project to provide educational resources to web development teachers">

Expand All @@ -34,7 +34,7 @@
<body>
<nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid">
<a class="navbar-brand" href="/">MyWebClass</a>
<a class="navbar-brand" href="/">Web systems</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand Down