Add simple UI code

fix
add ecr push
2021-07-12 12:29:54 +02:00 · 2020-12-05 16:07:04 +01:00 · 2020-12-05 16:06:13 +01:00
3 changed files with 21 additions and 5 deletions
--- a/13
+++ b/13
@@ -5,6 +5,10 @@ pipeline {
    tools {
        maven 'Maven'
    }
+    environment {
+        ECR_REPO_URL = '664574038682.dkr.ecr.eu-west-3.amazonaws.com'
+        IMAGE_REPO = "${ECR_REPO_URL}/java-maven-app"
+    }
    stages {
        stage('increment version') {
            steps {
@@ -16,6 +20,7 @@ pipeline {
                    def matcher = readFile('pom.xml') =~ '<version>(.+)</version>'
                    def version = matcher[0][1]
                    env.IMAGE_NAME = "$version-$BUILD_NUMBER"
+                    echo "############ ${IMAGE_REPO}"
                }
            }
        }
@@ -31,10 +36,10 @@ pipeline {
            steps {
                script {
                    echo "building the docker image..."
-                    withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
-                        sh "docker build -t nanajanashia/demo-app:${IMAGE_NAME} ."
-                        sh "echo $PASS | docker login -u $USER --password-stdin"
-                        sh "docker push nanajanashia/demo-app:${IMAGE_NAME}"
+                    withCredentials([usernamePassword(credentialsId: 'ecr-credentials', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+                        sh "docker build -t ${IMAGE_REPO}:${IMAGE_NAME} ."
+                        sh "echo $PASS | docker login -u $USER --password-stdin ${ECR_REPO_URL}"
+                        sh "docker push ${IMAGE_REPO}:${IMAGE_NAME}"
                    }
                }
            }
--- a/kubernetes/deployment.yaml
+++ b/kubernetes/deployment.yaml
@@ -18,7 +18,7 @@ spec:
        - name: my-registry-key
      containers:
        - name: $APP_NAME
-          image: nanajanashia/demo-app:$IMAGE_NAME
+          image: $IMAGE_REPO:$IMAGE_NAME
          imagePullPolicy: Always
          ports:
            - containerPort: 8080
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -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>
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