Skip to content
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.

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

Main #146

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

Main #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
8923d38
commiting the dockerfile
Nov 16, 2023
9dae696
testingJob1
Nov 16, 2023
cdf7ea2
2ndtimetesting
Nov 16, 2023
553f0ea
final release
Nov 16, 2023
588dfb1
capstone project2
Nov 18, 2023
3640b8c
capstone project 2 dockerfile
Nov 18, 2023
841e8a5
deployment and service file
Nov 18, 2023
5a919a1
commiting changes
Nov 18, 2023
22504c3
Update services.yaml
amelkalidas Nov 18, 2023
2233de5
editing few changes on services.yaml
Nov 18, 2023
c34d344
Merge branch 'master' of https://github.com/amelkalidas/Cap-PJ1
Nov 18, 2023
6ad217b
test
Nov 18, 2023
6c95d6c
testing changes on deploy.yaml
Nov 19, 2023
fab4953
removed testing file
Nov 19, 2023
fb27dec
removed 1.txt
Nov 19, 2023
bf85222
added /latest
Nov 19, 2023
ce2376a
removed /
Nov 19, 2023
b101500
Merge branch 'develop' of https://github.com/amelkalidas/Cap-PJ1
Nov 19, 2023
7217b46
replaced existing dockerfile
Nov 20, 2023
e1cbd22
edited masterdockerfile
Nov 20, 2023
5604d93
Rename masterdockerfile to Dockerfile
amelkalidas Nov 22, 2023
c297fb9
test
Nov 22, 2023
bc6249e
Merge branch 'master' of https://github.com/amelkalidas/Cap-PJ1
Nov 22, 2023
584175e
removed test
Nov 22, 2023
225d5bf
Removed dockerfile
Dec 23, 2023
8c3e90f
Removing unwanted file
Dec 23, 2023
cf3d404
dockerfile
Dec 23, 2023
089562f
testing
Dec 23, 2023
4a88131
removed test
Dec 24, 2023
8e975f2
testing
Dec 24, 2023
703988a
made changes on index.html page
Dec 24, 2023
baeddf6
removed test
Dec 24, 2023
5a0105f
testing
Dec 24, 2023
d54e923
updated index.tml
Dec 24, 2023
8fb84b2
removing testing
Dec 27, 2023
bb62d6a
tessting
Dec 27, 2023
c48d7b6
removing dockerfile
Jan 12, 2024
d2b6d21
adding dockerfile
Jan 12, 2024
dbba952
removing unwatned files
Jan 12, 2024
36d5fe3
adding copy
Jan 12, 2024
f22311f
adding deployment and service.yaml file
Jan 12, 2024
c55035f
testing
Jan 12, 2024
f2b2549
edited files
Jan 12, 2024
1cecb1a
edited service yaml file
Jan 12, 2024
fe05696
edited dockerfile cmd
Jan 12, 2024
654abaf
modified the dockerfile
Jan 12, 2024
b409fdf
changed deployment file
Jan 12, 2024
a168bfc
Create Test
amelkalidas Feb 12, 2024
651ab5a
added hello
Feb 12, 2024
01720d3
added testring 1.txt
amagri Feb 12, 2024
9addcd2
test1
amagri Feb 12, 2024
d28ec9f
addded 1
amagri Feb 12, 2024
36bb276
added 2
amagri Feb 12, 2024
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
Empty file added 1.txt
Empty file.
Empty file added 2.txt
Empty file.
1 change: 1 addition & 0 deletions Test
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12eqwe123
21 changes: 21 additions & 0 deletions deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: prt-deployment
labels:
app: prtapp01
spec:
replicas: 2
selector:
matchLabels:
app: prtapp01
template:
metadata:
labels:
app: prtapp01
spec:
containers:
- name: myprtcontainer
image: ameldocker98/vault:imagev2
ports:
- containerPort: 80
6 changes: 6 additions & 0 deletions dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM ubuntu:latest
RUN apt-get update
RUN apt-get install -y apache2
COPY . /var/www/html
EXPOSE 80
CMD ["apachectl", "-D", "FOREGROUND"]
1 change: 1 addition & 0 deletions hello.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello World
Binary file added images/Learn.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ideaimage.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/success.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 111 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,115 @@
<html>
<!DOCTYPE html>
<html lang="en">
<head>
<title> Intellipaat </title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Enhanced Apache Webpage</title>
<style>
body {
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
margin: 20px;
background-color: #f4f4f4;
color: #333;
}
header {
background-color: #333;
color: #fff;
padding: 10px;
text-align: center;
}
nav {
margin-top: 10px;
}
nav a {
text-decoration: none;
color: #0066cc;
margin: 0 10px;
}
section {
padding: 20px;
}
footer {
background-color: #333;
color: #fff;
padding: 10px;
text-align: center;
position: fixed;
bottom: 0;
width: 100%;
}
.gallery {
display: flex;
flex-wrap: wrap;
justify-content: space-around;
margin-top: 20px;
}
.gallery img {
width: 100%;
max-width: 300px;
margin-bottom: 10px;
}
</style>
</head>
<body style = "background-image:url('images/github3.jpg'); background-size: 100%">
<h2 ALIGN=CENTER>Hello world!</h2>
<body>

<header>
<h1>Enhanced Apache Webpage</h1>
</header>

<nav>
<a href="#home">Home</a>
<a href="#about">About</a>
<a href="#gallery">Gallery</a>
<a href="#contact">Contact</a>
</nav>

<section id="home">
<h2>Welcome to our Enhanced Website!</h2>
<p>This webpage features a responsive design, a gallery section, and an interactive element. Explore the various sections and features.</p>
</section>

<section id="about">
<h2>About Us</h2>
<p>We are a creative and innovative team dedicated to providing high-quality web solutions.</p>
</section>

<section id="gallery">
<h2>Image Gallery</h2>
<div class="gallery">
<img src="images/github3.jpg" alt="Image 1">
<img src="images/ideaimage.jpg" alt="Image 2">
<img src="images/success.jpg" alt="Image 3">
<!-- Add more images as needed -->
</div>
</section>

<section id="contact">
<h2>Contact Us</h2>
<form action="/submit" method="post">
<label for="name">Name:</label>
<input type="text" id="name" name="name" required>

<label for="email">Email:</label>
<input type="email" id="email" name="email" required>

<label for="message">Message:</label>
<textarea id="message" name="message" rows="4" required></textarea>

<button type="submit">Submit</button>
</form>
</section>

<footer>
&copy; 2023 Enhanced Apache Webpage. All rights reserved.
</footer>

<script>
// Interactive Feature Example
const welcomeMessage = document.querySelector("#home h2");
welcomeMessage.addEventListener("click", function() {
alert("Thanks for clicking! This is an interactive feature.");
});
</script>

</body>
</html>
1 change: 1 addition & 0 deletions sample1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
added another file
12 changes: 12 additions & 0 deletions service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: v1
kind: Service
metadata:
name: prt-service
spec:
type: NodePort
selector:
app: prtapp01
ports:
- protocol: TCP
port: 80
nodePort: 30010
3 changes: 3 additions & 0 deletions test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

asdnkajsnd

2 changes: 2 additions & 0 deletions testing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
git add.

1 change: 1 addition & 0 deletions testing1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test