-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Hotfix/1.0 #11
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
Open
csenapati12
wants to merge
175
commits into
daticahealth:master
Choose a base branch
from
csenapati12:hotfix/1.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Hotfix/1.0 #11
Changes from all commits
Commits
Show all changes
175 commits
Select commit
Hold shift + click to select a range
09aae83
Create Jenkinsfile
csenapati12 d955739
Rename Jenkinsfile to Dockerfile
csenapati12 6bb9e7a
Update Dockerfile
csenapati12 a490145
Update Dockerfile
csenapati12 1463aaf
Update Dockerfile
csenapati12 cbe2dac
Update Dockerfile
csenapati12 b8059ef
Create Jenkinsfile
csenapati12 1e77102
Update Jenkinsfile
csenapati12 ce86c7e
Merge pull request #1 from csenapati12/dev-with-dockerfile
csenapati12 0a40bdc
Update index.jsp
csenapati12 2ea635c
Update index.jsp
csenapati12 8fd5ee6
Update pom.xml
csenapati12 a0c6637
Update index.jsp
csenapati12 263bc19
Update pom.xml
csenapati12 444bedc
Update README.md
csenapati12 6a55f09
test commit on 4th feb
csenapati12 a9d5992
Update Dockerfile
csenapati12 dfc9942
Update Dockerfile
csenapati12 bde6106
Update Dockerfile
csenapati12 be5e91c
Update index.jsp
csenapati12 623fc3d
Update index.jsp
csenapati12 3a1ffa5
Update Dockerfile
csenapati12 f3e975f
Update index.jsp
csenapati12 e778d40
Update Jenkinsfile
csenapati12 f3aa56b
Update Jenkinsfile
csenapati12 79f6abd
Update Jenkinsfile
csenapati12 8a44512
Update Jenkinsfile
csenapati12 9b2ba9c
Update pom.xml
csenapati12 5001e22
Update pom.xml
csenapati12 4a22c5f
Update pom.xml
csenapati12 10518be
Update pom.xml
csenapati12 4e9c5c1
Update pom.xml
csenapati12 c363a86
Update pom.xml
csenapati12 63c142f
Update pom.xml
csenapati12 a4c8d60
Update pom.xml
csenapati12 be5815f
Update pom.xml
csenapati12 beb326a
Update pom.xml
csenapati12 8cbe699
Update pom.xml
csenapati12 a750ffe
Update pom.xml
csenapati12 cc56a07
Update index.jsp
csenapati12 7a4ba91
Update index.jsp
csenapati12 75a0a21
Update index.jsp
csenapati12 0b6c736
Update Jenkinsfile
csenapati12 70e11c3
Update Jenkinsfile
csenapati12 23ebd20
Create Jenkinsfile-new
csenapati12 0f1609d
Update index.jsp
csenapati12 7baa96b
Update pom.xml
csenapati12 255effc
Update index.jsp
csenapati12 f5c378e
Update index.jsp
csenapati12 a1a7de6
Update index.jsp
csenapati12 f3a378f
Update Dockerfile
csenapati12 f97fef4
adding devops session
teluharish ee31988
Merge pull request #4 from teluharis/master
csenapati12 42b4c30
Update index.jsp
csenapati12 9ffb41c
Update index.jsp
csenapati12 ff23086
Update index.jsp
csenapati12 39a4ec4
Update index.jsp
csenapati12 da9f42d
Update Jenkinsfile
csenapati12 18d0ba8
Update Jenkinsfile
csenapati12 0ab0762
Create Jenkinsfile-docker
csenapati12 8a05da2
Update Jenkinsfile-docker
csenapati12 d84c926
Update index.jsp
csenapati12 fef86b8
Update Jenkinsfile-docker
csenapati12 d5ff135
Update Jenkinsfile-docker
csenapati12 bf27d65
test pull SCM
csenapati12 272b0fe
Update Jenkinsfile
csenapati12 5d5830d
Update Jenkinsfile
csenapati12 8929500
Update Jenkinsfile
csenapati12 521902b
Update index.jsp
csenapati12 d08d251
Update index.jsp
csenapati12 1d4dd69
Update index.jsp
csenapati12 5048d92
Update index.jsp
csenapati12 0fd4668
Update index.jsp
csenapati12 ad825bb
Update index.jsp
csenapati12 69a79fc
Update pom.xml
csenapati12 66da6df
Update pom.xml
csenapati12 0bc4842
Update index.jsp
csenapati12 9c87375
Update pom.xml
csenapati12 adcd79d
Update pom.xml
csenapati12 a76173b
Update pom.xml
csenapati12 4b778db
Update Dockerfile
csenapati12 a1c29ba
Update Dockerfile
csenapati12 76a22c2
Update Dockerfile
csenapati12 ee801a5
Update Dockerfile
csenapati12 f09b570
Update Dockerfile
csenapati12 d3bb162
Update pom.xml
csenapati12 59eb181
Update index.jsp
csenapati12 210f73c
Update index.jsp
csenapati12 29e27ae
Update Jenkinsfile
csenapati12 887f299
Update Jenkinsfile
csenapati12 fc495bb
Update index.jsp
csenapati12 7337161
Update index.jsp
csenapati12 42373db
Update index.jsp
csenapati12 9772829
Update pom.xml
csenapati12 a60f41a
Update pom.xml
csenapati12 5d66c37
Update pom.xml
csenapati12 d63527d
Update pom.xml
csenapati12 9a4b4ae
Update pom.xml
csenapati12 1cc21b9
Update pom.xml
csenapati12 38fa8ae
Update pom.xml
csenapati12 36e898e
Update pom.xml
csenapati12 6266d03
Update pom.xml
csenapati12 4842b00
Update pom.xml
csenapati12 ca587ff
Update index.jsp
csenapati12 eb3cda5
Update index.jsp
csenapati12 ad556bd
Update pom.xml
csenapati12 d051623
Update Dockerfile
csenapati12 c66ec5a
Update index.jsp
csenapati12 21d2e35
Update pom.xml
csenapati12 4cd7cfb
Update index.jsp
csenapati12 075c61b
Update Dockerfile
csenapati12 ecbf322
Update index.jsp
csenapati12 a099597
Update index.jsp
csenapati12 3cebd9b
Update index.jsp
csenapati12 4c723cd
Update index.jsp
csenapati12 50c2dab
Update index.jsp
csenapati12 d09d0bd
Update index.jsp
csenapati12 be8b275
Update pom.xml
csenapati12 e9ba613
Update pom.xml
csenapati12 3682ee4
Update Dockerfile
csenapati12 9446032
Update index.jsp
csenapati12 62236bf
Update index.jsp
csenapati12 24c8539
Update index.jsp
csenapati12 6984ac0
Update pom.xml
csenapati12 e49756f
Update pom.xml
csenapati12 88963e0
Update pom.xml
csenapati12 da610ba
Update pom.xml
csenapati12 8cc9fc0
Update Dockerfile
csenapati12 bbf50ee
Update pom.xml
csenapati12 c71cfaa
Update pom.xml
csenapati12 4b4d63b
Update README.md
csenapati12 43b8560
Update README.md
csenapati12 c8d5a6b
Update README.md
csenapati12 1bb20c1
Update index.jsp
csenapati12 1655e4e
Update index.jsp
csenapati12 b75c4f1
Update README.md
csenapati12 1c95899
ansible
csenapati12 3304879
Update deployfile.yml
csenapati12 37faf19
Update pom.xml
csenapati12 429a608
Update deployfile.yml
csenapati12 cbeb620
Update deployfile.yml
csenapati12 4d1bb32
Update Jenkinsfile
csenapati12 b9e26bb
Update deployfile.yml
csenapati12 6387745
Update index.jsp
csenapati12 c9e9336
Update Jenkinsfile
csenapati12 d7f61b9
Create deploytomcat.yml
csenapati12 80e3415
Create Jenkinsfile-latest
csenapati12 68b8ab4
Create ansible-hosts
csenapati12 b46a0d8
Update Jenkinsfile-latest
csenapati12 bfdc833
Update ansible-hosts
csenapati12 c84683b
Update Dockerfile
csenapati12 6620cdc
Update Dockerfile
csenapati12 6785f5a
Update index.jsp
csenapati12 64bb382
Update Dockerfile
csenapati12 04461f6
Update Dockerfile
csenapati12 7f1d408
Update Jenkinsfile
csenapati12 4376cd9
Update Jenkinsfile
csenapati12 58cff91
Update Jenkinsfile
csenapati12 c35297c
Update Jenkinsfile
csenapati12 d38d847
Update Jenkinsfile
csenapati12 e6d071d
Update Dockerfile
csenapati12 0fa78f9
Revert "Update Jenkinsfile"
csenapati12 41ed03b
Update index.jsp
csenapati12 829325f
Update index.jsp
csenapati12 ec3d6db
Update pom.xml
csenapati12 7fc2f1a
Update pom.xml
csenapati12 d4113ed
Update pom.xml
csenapati12 5e0c432
Update pom.xml
csenapati12 5f238bd
Update pom.xml
csenapati12 37ece56
Update pom.xml
csenapati12 3a4dcb4
Update pom.xml
csenapati12 43f5929
Update index.jsp
csenapati12 2295672
Update pom.xml
csenapati12 b037dc5
Create maven.yml
csenapati12 72de7ec
Update Jenkinsfile
csenapati12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| # This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time | ||
| # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven | ||
|
|
||
| name: Java CI with Maven | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| pull_request: | ||
| branches: [ master ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Set up JDK 11 | ||
| uses: actions/setup-java@v2 | ||
| with: | ||
| java-version: '11' | ||
| distribution: 'temurin' | ||
| cache: maven | ||
| - name: Build with Maven | ||
| run: mvn -B package --file pom.xml |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| FROM ubuntu:16.04 | ||
| RUN apt-get update && \ | ||
| apt-get upgrade -y && \ | ||
| apt-get install -y curl && \ | ||
| apt-get install -y software-properties-common && \ | ||
| add-apt-repository ppa:webupd8team/java -y && \ | ||
| apt-get update && \ | ||
| echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \ | ||
| apt-get install -y openjdk-8-jdk && \ | ||
| apt-get clean | ||
| RUN groupadd tomcat | ||
| RUN useradd -s /bin/false -g tomcat -d /opt/tomcat tomcat | ||
| RUN cd /tmp | ||
| RUN curl -O https://mirrors.estointernet.in/apache/tomcat/tomcat-8/v8.5.69/bin/apache-tomcat-8.5.69.tar.gz | ||
| RUN mkdir /opt/tomcat | ||
| RUN gzip -V | ||
| RUN tar -xvzf apache-tomcat-8.5.69.tar.gz -C /opt/tomcat --strip-components=1 | ||
| RUN cd /opt/tomcat | ||
| RUN chgrp -R tomcat /opt/tomcat | ||
| ADD target/myapp.war /opt/tomcat/webapps | ||
| #RUN chown -R tomcat conf/ webapps/ work/ temp/ logs/ | ||
| #RUN update-java-alternatives -l | ||
| ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 | ||
| Run cd /opt/tomcat/bin | ||
| expose 8080 | ||
| #CMD /opt/tomcat/bin/catalina.sh run && tail -f /opt/tomcat/logs/catalina.out | ||
| CMD ["/opt/tomcat/bin/catalina.sh", "run"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| pipeline { | ||
| node { label "$NODE" } | ||
| parameters { | ||
| // gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH' | ||
| // parameters { string(name: 'NODE', defaultValue: 'some_node', description: '') } | ||
| // | ||
| gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'BRANCH', type: 'PT_BRANCH',string(name: 'NODE', defaultValue: 'master', description: '') | ||
|
|
||
| } | ||
| stages { | ||
| stage('Checkout') { | ||
| steps { | ||
| git branch: "${params.BRANCH}", url: 'https://github.com/csenapati12/java-tomcat-maven-docker.git' | ||
|
|
||
| } | ||
| } | ||
| stage('Build and Package') { | ||
| steps { | ||
|
|
||
| script{ | ||
| sh """ | ||
| ls | ||
| # mvn clean package | ||
| echo "MAster" | ||
| ls -la | ||
| """ | ||
| } | ||
|
|
||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| node(){ | ||
| checkout scm | ||
|
|
||
| stage('compile') { | ||
| echo "compile" | ||
| } | ||
| stage('test') { | ||
| echo "test" | ||
| } | ||
|
|
||
| stage('Maven Build') { | ||
|
|
||
| } | ||
| stage('deploy to nexus') { | ||
| echo "deploy" | ||
| } | ||
|
|
||
| stage('Docker Build') { | ||
| echo "Docker build" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| node(){ | ||
| checkout scm | ||
| stage('Code build'){ | ||
| sh "mvn package" | ||
| } | ||
| stage('Docker build and start'){ | ||
| sh ''' | ||
|
|
||
| docker build -t testimage . | ||
| docker run --name=newcontainer -d -p 9898:8080 testimage | ||
| ''' | ||
| } | ||
| stage('Smoke testing and result'){ | ||
| echo "smoke testing" | ||
| } | ||
|
|
||
| stage('Docker build and start'){ | ||
| sh ''' | ||
| docker stop newcontainer | ||
| docker rm -f newcontainer | ||
| docker rmi testimage | ||
|
|
||
| ''' | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| pipeline{ | ||
| agent any | ||
| stages{ | ||
| stage("checkout"){ | ||
| steps{ | ||
| checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/csenapati12/java-tomcat-maven-docker.git']]] | ||
| } | ||
| } | ||
| stage("Build and packaging"){ | ||
| steps{ | ||
| sh """ | ||
| mvn clean package | ||
| """ | ||
| } | ||
| } | ||
| stage("Deploy tomcat"){ | ||
| steps{ | ||
| script{ | ||
| ansiblePlaybook credentialsId: 'root-credentials', inventory: 'ansible-hosts', playbook: 'deploytomcat.yml' | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| pipeline { | ||
|
|
||
| agent any | ||
| parameters { | ||
| choice choices: ['DeployL1_L2_L3', 'L4', 'L6'], description: 'Please select the environment to Deploy!!!', name: 'ENV_NAME' | ||
| choice choices: ['HSVALIDATION_BUSINESS_SERVICE', 'HSVALIDATION_DATA_SERVICE'], description: 'Please select the application!!!', name: 'APP_NAME' | ||
| choice choices: ['HSVALIDATION_BUSINESS_SERVICE1', 'HSVALIDATION_DATA_SERVICE2'], description: 'Please select the application!!!', name: 'APP_NAME' | ||
| } | ||
| stages { | ||
|
|
||
| stage('Code checkout') { | ||
| when { | ||
| expression { params.ENV_NAME =='DeployL1_L2_L3'} | ||
| } | ||
| steps { | ||
| echo "helllo" | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| [deploy-tomcat] | ||
| #34.122.68.73 | ||
| 35.238.183.82 | ||
| 130.211.221.35 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| --- | ||
| - hosts: localhost | ||
| become: true | ||
| become_user: root | ||
| tasks: | ||
| - name: Copy the playbook | ||
| copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/myapp.war dest=/home/skylab_priyadarshini/tomcat8/webapps | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| --- | ||
| - hosts: deploy-tomcat | ||
| become: true | ||
| become_user: root | ||
| tasks: | ||
| - name: Copy the artifact | ||
| copy: src=/var/lib/jenkins/workspace/ansible-pipleline/target/myapp.war dest=/home/tomcat/apache-tomcat-8.5.64/webapps |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| <html> | ||
| <body> | ||
| <h2>Hello World!</h2> | ||
| <body> | ||
| <marquee> | ||
| <h2 style="background-color:DodgerBlue;"> Welcome To</h2> | ||
| <h1 style="background-color:Tomato;"> Test App </h1> | ||
| <h2> !!!!!!!!!!!!!!!!!!15th Aug ?????????!!!!!!!!!!!!!!!!!!!!!!!!<h2> | ||
| </marquee> | ||
|
|
||
| </body> | ||
| </html> | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<marquee>😂