prox/java-maven-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: prox:feature/eks-tf-prep
Branches Tags
prox:master prox:feature/jenkinsfile-sshagent prox:jenkins-jobs prox:feature/deploy-jar-to-nexus prox:deploy-to-lke prox:deploy-on-k8s prox:complete-pipeline-ecr-eks prox:feature/ansible prox:feature/ansible-prep prox:feature/payment prox:feature/k8s prox:feature/eks-tf-prep prox:feature/sshagent-terraform prox:jenkins-shared-lib prox:bugfix/jenkins-pipeline
...
pull from: prox:complete-pipeline-ecr-eks
Branches Tags
prox:feature/jenkinsfile-sshagent prox:jenkins-jobs prox:master prox:feature/deploy-jar-to-nexus prox:deploy-to-lke prox:deploy-on-k8s prox:complete-pipeline-ecr-eks prox:feature/ansible prox:feature/ansible-prep prox:feature/payment prox:feature/k8s prox:feature/eks-tf-prep prox:feature/sshagent-terraform prox:jenkins-shared-lib prox:bugfix/jenkins-pipeline

3 Commits
feature/ek ... complete-p

Author SHA1 Message Date
Nana Janashia
0023bf9bde Add simple UI code 2021-07-12 12:29:54 +02:00
Nana Janashia
b52b845526 fix 2020-12-05 16:07:04 +01:00
Nana Janashia
3559bee477 add ecr push 2020-12-05 16:06:13 +01:00
3 changed files with 21 additions and 5 deletions
Expand all files Collapse all files

13
Jenkinsfile vendored
View File

@@ -5,6 +5,10 @@ pipeline {
tools { tools {
maven 'Maven' maven 'Maven'
} }
environment {
ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
}
stages { stages {
stage('increment version') { stage('increment version') {
steps { steps {
@@ -16,6 +20,7 @@ pipeline {
def matcher = readFile('pom.xml') =~ '<version>(.+)</version>' def matcher = readFile('pom.xml') =~ '<version>(.+)</version>'
def version = matcher[0][1] def version = matcher[0][1]
env.IMAGE_NAME = "$version-$BUILD_NUMBER" env.IMAGE_NAME = "$version-$BUILD_NUMBER"
echo "############ ${IMAGE_REPO}"
} }
} }
} }
@@ -31,10 +36,10 @@ pipeline {
steps { steps {
script { script {
echo "building the docker image..." echo "building the docker image..."
withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) { withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
sh "docker build -t nanajanashia/demo-app:${IMAGE_NAME} ." sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
sh "echo $PASS | docker login -u $USER --password-stdin" sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
sh "docker push nanajanashia/demo-app:${IMAGE_NAME}" sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
} }
} }
} }

2
kubernetes/deployment.yaml
View File

@@ -18,7 +18,7 @@ spec:
- name: my-registry-key - name: my-registry-key
containers: containers:
- name: $APP_NAME - name: $APP_NAME
image: nanajanashia/demo-app:$IMAGE_NAME image: $IMAGE_REPO:$IMAGE_NAME
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 8080 - containerPort: 8080

11
src/main/resources/static/index.html Normal file
View File

@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>MyApp</title>
</head>
<body>
<h1>Welcome to Java Maven Application</h1>
<!-- add image here <img src="" width="" /> -->
</body>
</html>