diff --git a/apple b/.ignore similarity index 100% rename from apple rename to .ignore diff --git a/Dockerfile b/Dockerfile index 720df6b3d7..7b1540a4aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM tomcat:8.0.20-jre8 +FROM tomcat:9.0 # Dummy text to test -COPY target/myweb*.war /usr/local/tomcat/webapps/myweb.war - +COPY target/myweb*.war /usr/local/tomcat/webapps/ +CMD ["catalina.sh","run"] +EXPOSE 8080 diff --git a/Jenkins-ansible b/Jenkins-ansible index 0a6a8d6e32..82c7338322 100644 --- a/Jenkins-ansible +++ b/Jenkins-ansible @@ -45,4 +45,4 @@ pipeline{ } } -} +hhhhhh} diff --git a/Jenkins-decdemo b/Jenkins-decdemo index 032870a253..c23b626cc7 100644 --- a/Jenkins-decdemo +++ b/Jenkins-decdemo @@ -1,17 +1,30 @@ -pipeline{ +pipeline { agent any - stages{ - stage("GIT checkout"){ - steps{ - git credentialsId: 'javahome', url: 'https://github.com/srinivas1987devops/myweb.git' - + + stages { + stage('git checkout') { + steps { + git 'https://github.com/krishnaobbu/myweb.git' } } - stage("Maven Build"){ - steps{ - sh "mvn clean package" - sh "mv target/*.war target/myweb.war" + stage('build') { + steps { + sh 'mvn clean package' } - } + } + stage('deploy to dev') { + steps { + sshagent(['tomcat-new']) { + sh """ + scp -o StrictHostKeyChecking=no target/myweb.war ubuntu@172.31.46.47:/home/ubuntu/apache-tomcat-9.0.85/webapps/ + + ssh ubuntu@172.31.46.47 /home/ubuntu/apache-tomcat-9.0.85/bin/shutdown.sh + + ssh ubuntu@172.31.46.47 /home/ubuntu/apache-tomcat-9.0.85/bin/startup.sh + + """ + } + } + } } } diff --git a/Jenkins-decnew b/Jenkins-decnew index 634a7de1de..f97a02fb99 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -7,7 +7,7 @@ pipeline{ stages{ stage("Git Checkout"){ steps{ - git credentialsId: 'javahome2', url: 'https://github.com/srinivas1987devops/myweb.git' + git credentialsId: 'hari', url: 'https://github.com/krishnaobbu/myweb.git' } } stage("Maven Build"){ @@ -18,13 +18,13 @@ pipeline{ } stage("deploy-dev"){ steps{ - sshagent(['tomcat-new']) { + sshagent(['hari-new']) { sh """ - scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.13.102:/home/ec2-user/apache-tomcat-9.0.63/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.6.54:/home/ec2-user/apache-tomcat-9.0.63/webapps/ - ssh ec2-user@172.31.13.102 /home/ec2-user/apache-tomcat-9.0.63/bin/shutdown.sh + ssh ec2-user@172.31.6.54 /home/ec2-user/apache-tomcat-9.0.63/bin/shutdown.sh - ssh ec2-user@172.31.13.102 /home/ec2-user/apache-tomcat-9.0.63/bin/startup.sh + ssh ec2-user@172.31.6.54 /home/ec2-user/apache-tomcat-9.0.63/bin/startup.sh """ } diff --git a/bhavani b/bhavani deleted file mode 100644 index de8a7e28ac..0000000000 --- a/bhavani +++ /dev/null @@ -1 +0,0 @@ -she is new to cloud and automation diff --git a/deployments.yml b/deployments.yml index 91a67a7d63..457900e901 100644 --- a/deployments.yml +++ b/deployments.yml @@ -5,7 +5,7 @@ metadata: labels: app: myweb spec: - replicas: 6 + replicas: 3 selector: matchLabels: app: myweb @@ -16,6 +16,6 @@ spec: spec: containers: - name: myweb - image: kammana/myweb:"$(version)" + image: krishnaobbu/springboot:3 ports: - containerPort: 8080 diff --git a/f2 b/f2 deleted file mode 100644 index aa51c0afd7..0000000000 --- a/f2 +++ /dev/null @@ -1 +0,0 @@ -bcuhbbcijbiocj diff --git a/hdfc1.0 b/kube similarity index 100% rename from hdfc1.0 rename to kube diff --git a/login b/login new file mode 100644 index 0000000000..894758bb05 --- /dev/null +++ b/login @@ -0,0 +1 @@ +user modification diff --git a/logincr b/logincr new file mode 100644 index 0000000000..5ff825ce63 --- /dev/null +++ b/logincr @@ -0,0 +1,2 @@ +first login +create new or second user login ###########bala############## diff --git a/madan b/madan deleted file mode 100644 index 211ade27b6..0000000000 --- a/madan +++ /dev/null @@ -1 +0,0 @@ -he is new cloud and automation diff --git a/mani b/mani deleted file mode 100644 index 449c195936..0000000000 --- a/mani +++ /dev/null @@ -1 +0,0 @@ -He is new to pull request diff --git a/merge-conf b/merge-conf new file mode 100644 index 0000000000..5faf06544e --- /dev/null +++ b/merge-conf @@ -0,0 +1,2 @@ +i am new to dev2 +i am from hyd diff --git a/pom.xml b/pom.xml index 8b2960e6b5..0f804e0d05 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ kammana - http://13.231.239.118:9000/ + http://http://13.201.30.151:9000/ @@ -28,12 +28,12 @@ nexusRepo - http://35.78.181.229:8081/repository/sample-snapshots/ + http://44.204.229.166:8081/repository/sample-snapshot/ nexusRepo - http://35.78.181.229:8081/repository/sample-releases/ + http://44.204.229.166:8081/repository/sample-release/ diff --git a/sateesh b/sateesh deleted file mode 100644 index 3c3db36c75..0000000000 --- a/sateesh +++ /dev/null @@ -1,9 +0,0 @@ -one -two -three -four -five -six -seven -eight -nine diff --git a/sbigoldloan b/sbigoldloan deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sbihomeloan b/sbihomeloan deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sbiib b/sbiib deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/sbipl1.0 b/sbipl1.0 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/service.yml b/service.yml new file mode 100644 index 0000000000..0bfaf6f52e --- /dev/null +++ b/service.yml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: Service +metadata: + name: springboot +spec: + type: NodePort + ports: + - port: 8080 + targetPort: 8080 + selector: + app: myweb diff --git a/springBoot.yml b/springBoot.yml index 8eec0608d5..0265c923de 100644 --- a/springBoot.yml +++ b/springBoot.yml @@ -13,7 +13,7 @@ spec: app: springboot spec: containers: - - image: deepikac2021/spring-boot-mongo + - image: krishnaobbu/spring-boot-mongo name: springboot ports: - containerPort: 8080 diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 1e72744a54..0f67e3b5ac 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

GANA TECH APP VERSION-3000

+

welcome to docker version 1

diff --git a/venu b/venu deleted file mode 100644 index aa9d66f2a2..0000000000 --- a/venu +++ /dev/null @@ -1,2 +0,0 @@ -He is also new to git and github -jenkins and sonar