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

new update #48

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4d5e13f
new update
navalgoski Aug 14, 2022
95df864
troubleshoot1
navalgoski Aug 14, 2022
acf80be
Revert "troubleshoot1"
navalgoski Aug 14, 2022
89e3466
independanceday
navalgoski Aug 15, 2022
df072a0
2022
navalgoski Aug 15, 2022
b17825a
Revert "2022"
navalgoski Aug 15, 2022
4e16aed
branchconcept
navalgoski Aug 15, 2022
26fc4c7
Merge pull request #1 from navalgoski/dev
navalgoski Aug 15, 2022
f4af27a
Update aug22.html
navalgoski Aug 15, 2022
7087276
urgentwork
navalgoski Aug 15, 2022
b56839b
Merge branch 'pullmaster' of https://github.com/navalgoski/myweb into…
navalgoski Aug 15, 2022
17186c8
urgentwork
navalgoski Aug 15, 2022
d77cfcc
stash
navalgoski Aug 15, 2022
5806fb1
Merge pull request #2 from navalgoski/dev
navalgoski Aug 15, 2022
b9f3d7b
Update pom.xml
navalgoski Aug 20, 2022
c3319a1
Update pom.xml
navalgoski Aug 20, 2022
d250936
Update pom.xml
navalgoski Aug 20, 2022
65861c2
Update index.jsp
navalgoski Aug 21, 2022
ed2e519
Add files via upload
navalgoski Aug 21, 2022
65755e5
Update index.jsp
navalgoski Aug 21, 2022
d49f095
image
navalgoski Aug 21, 2022
4e70148
Merge branch 'master' into dev
navalgoski Aug 21, 2022
a8394d8
Merge pull request #3 from navalgoski/dev
navalgoski Aug 21, 2022
08f2e7c
Add files via upload
navalgoski Aug 21, 2022
e3943b5
Update index.jsp
navalgoski Aug 21, 2022
8af974c
Create Jenkinsfile-nov22
navalgoski Nov 6, 2022
b9e9c42
Update Jenkinsfile2
navalgoski Nov 8, 2022
db385e9
Update Jenkinsfile2
navalgoski Nov 8, 2022
94e19cc
Update pom.xml
navalgoski Nov 8, 2022
08b174a
Update pom.xml
navalgoski Nov 20, 2022
f9071cb
Update pom.xml
navalgoski Nov 20, 2022
7d97491
an
navalgoski Nov 30, 2022
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
21 changes: 21 additions & 0 deletions Jenkinsfile-nov22
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@Library("novlibs") _
pipeline{
agent any
stages{
stage("git checkout"){
steps{
git credentialsId: 'github-creds-ov22', url: 'https://github.com/navalgoski/myweb.git'
}
}
stage("maven build"){
steps{
sh 'mvn clean package'
}
}
stage("Dev Tomcat Deploy"){
steps{
tomcatDeploy ("10.100.202.100", "ec2-user", "tomcat-dev")
}
}
}
}
52 changes: 29 additions & 23 deletions Jenkinsfile2
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
node {
stage('Git'){
git 'https://github.com/javahometech/myweb'
}

stage('Maven Build'){
sh 'mvn clean package'
}
stage('Archive Artifacts'){
archiveArtifacts 'target/myweb.war'
}

stage('Email'){

mail bcc: '', body: '''Thanks,
Java Home''', cc: '', from: '', replyTo: '', subject: 'Pipeline Demo', to: '[email protected]'





}
}
pipeline{
agent any
stages{
stage("Maven Build"){
when{
branch "dev"
}
steps{
sh "mvn package"
}
}
stage("Deploy To dev"){
when{
branch "dev"
}
steps{
echo "deploying to development server"
}
}
stage("Deploy To prod"){
when{
branch"master"
}
steps{
echo "deploying to master server"
}
}
}
}
4 changes: 4 additions & 0 deletions august/aug22.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h1 "style:color=red> Independance day
demo create branch
fetch
</h1>
4 changes: 4 additions & 0 deletions august/gitbranch.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<h1 "style:color=purple">
created dev branch
stash command 2
</h1>
3 changes: 3 additions & 0 deletions august/gitdevbranch.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h1> branch commit
stash command
</h1>
1 change: 1 addition & 0 deletions august/stashurgentwork
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uregent work
3 changes: 3 additions & 0 deletions august/stashurgentwork.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h1>
uregent work
</h1>
2 changes: 1 addition & 1 deletion docker-ci-cd
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ node{
}

}

hi kscdniwedcmn kas
16 changes: 16 additions & 0 deletions jhcansible/apache.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
- hosts: 10.100.102.28
become: True
tasks:
- name: install apache
yum:
name: httpd
state: present
- name: Copy index file onto apache
copy:
src: index.html
dest: /var/www/html/
- name: start and enable apache
service:
name: httpd
state: started
enabled: True
2 changes: 2 additions & 0 deletions jhcansible/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<h1> ansible demo1
</h1>
Binary file added naval.jpeg.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
105 changes: 56 additions & 49 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,51 +1,58 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>in.javahome</groupId>
<artifactId>myweb</artifactId>
<packaging>war</packaging>
<version>8.3.2</version>
<name>Java Home myweb</name>
<url>http://maven.apache.org</url>

<properties>
<docker.image.prefix>kammana</docker.image.prefix>
</properties>
<dependencies>
<dependency>
<groupId>com.oracle.bedrock</groupId>
<artifactId>bedrock-runtime-maven</artifactId>
<version>5.1.2</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>in.javahome</groupId>
<artifactId>myweb</artifactId>
<packaging>war</packaging>
<version>0.0.9</version>
<name>my-app</name>
<url>http://maven.apache.org</url>

</dependencies>

<distributionManagement>
<snapshotRepository>
<id>nexusRepo</id>
<url>http://13.233.230.166:8081/repository/maven-snapshots/</url>
</snapshotRepository>

<repository>
<id>nexusRepo</id>
<url>http://13.233.230.166:8081/repository/maven-releases/</url>
</repository>
</distributionManagement>

<pluginRepositories>
<pluginRepository>
<id>maven1</id>
<name>Maven.org</name>
<url>http://repo1.maven.org/maven2</url>
</pluginRepository>
</pluginRepositories>


</project>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
<!-- <scope>provided</scope> -->
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>2.1.7</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.0</version>
</dependency>
</dependencies>
<properties>
<maven.compiler.source>7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
</plugins>
</build>
</project>
7 changes: 5 additions & 2 deletions src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<html>
<!DOCTYPE html>
<body>
<h1 style="color: red; font-size: 40px;" align="center"> JavaHome App 2020 Weekend</h1>
<h1 style="color: red; font-size: 40px;" align="center"> Rakhshabandhan 2022</h1>
</body>
<body>
<img src="myweb/naval.jpeg" alt="naval">
</body>
</html>
Binary file added src/main/webapp/naval.jpeg.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.