Update pom.xml

Dockerfile

@@ -1,8 +0,0 @@
-FROM openjdk:8-jre-alpine
-
-EXPOSE 8080
-
-COPY ./target/java-maven-app-1.0-SNAPSHOT.jar /usr/app/
-WORKDIR /usr/app
-
-ENTRYPOINT ["java", "-jar", "java-maven-app-1.0-SNAPSHOT.jar"]

Jenkinsfile

@@ -1,52 +1,36 @@
-#!/usr/bin/env groovy
+def gv
-
-library identifier: 'jenkins-shared-library@master', retriever: modernSCM(
-    [$class: 'GitSCMSource',
-     remote: 'https://gitlab.com/nanuchi/jenkins-shared-library.git',
-     credentialsId: 'gitlab-credentials'
-    ]
-)
 
 pipeline {
     agent any
-    tools {
-        maven 'Maven'
-    }
-    environment {
-        IMAGE_NAME = 'nanajanashia/demo-app:java-maven-2.0'
-    }
     stages {
-        stage('build app') {
+        stage("init") {
             steps {
                 script {
-                  echo 'building application jar...'
+                    gv = load "script.groovy"
-                  buildJar()
                 }
             }
         }
-        stage('build image') {
+        stage("build jar") {
             steps {
                 script {
-                   echo 'building docker image...'
+                    echo "building jar"
-                   buildImage(env.IMAGE_NAME)
+                    //gv.buildJar()
-                   dockerLogin()
-                   dockerPush(env.IMAGE_NAME)
                 }
             }
         }
-        stage('deploy') {
+        stage("build image") {
             steps {
                 script {
-                   echo 'deploying docker image to EC2...'
+                    echo "building image"
-
+                    //gv.buildImage()
-                   def shellCmd = "bash ./server-cmds.sh ${IMAGE_NAME}"
+                }
-                   def ec2Instance = "ec2-user@35.180.251.121"
+            }
-
+        }
-                   sshagent(['ec2-server-key']) {
+        stage("deploy") {
-                       sh "scp -o StrictHostKeyChecking=no server-cmds.sh ${ec2Instance}:/home/ec2-user"
+            steps {
-                       sh "scp -o StrictHostKeyChecking=no docker-compose.yaml ${ec2Instance}:/home/ec2-user"
+                script {
-                       sh "ssh -o StrictHostKeyChecking=no ${ec2Instance} ${shellCmd}"
+                    echo "deploying"
-                   }
+                    //gv.deployApp()
                 }
             }
         }

docker-compose.yaml

@@ -1,12 +0,0 @@
-version: '3.8'
-services:
-    java-maven-app:
-      image: ${IMAGE}
-      ports:
-        - 8080:8080
-    postgres:
-      image: postgres:13
-      ports:
-        - 5432:5432
-      environment:
-        - POSTGRES_PASSWORD=my-pwd

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.example</groupId>
     <artifactId>java-maven-app</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
 
     <build>
         <plugins>
@@ -22,13 +22,20 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- to handle any Java version mismatch, add the following configuration for maven-compiler-plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-    <properties>
+
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

script.groovy

@@ -0,0 +1,19 @@
+def buildJar() {
+    echo "building the application..."
+    sh 'mvn package'
+} 
+
+def buildImage() {
+    echo "building the docker image..."
+    withCredentials([usernamePassword(credentialsId: 'docker-hub-repo', passwordVariable: 'PASS', usernameVariable: 'USER')]) {
+        sh 'docker build -t nanajanashia/demo-app:jma-2.0 .'
+        sh "echo $PASS | docker login -u $USER --password-stdin"
+        sh 'docker push nanajanashia/demo-app:jma-2.0'
+    }
+} 
+
+def deployApp() {
+    echo 'deploying the application...'
+} 
+
+return this

server-cmds.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-export IMAGE=$1
-docker-compose -f docker-compose.yaml up --detach
-echo "success"

src/test/java/AppTest.java

@@ -1,16 +0,0 @@
-import com.example.Application;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class AppTest {
-
-    @Test
-    public void testApp() {
-        Application myApp = new Application();
-
-        String result = myApp.getStatus();
-
-        assertEquals("OK", result);
-    }
-
-}