Development

Dockerfile

@@ -1,4 +1,4 @@
-FROM tomcat
-ADD target/addressbook.war /usr/local/tomcat/webapps
+FROM tomcat:8.5
+ADD target/addressbook.war /usr/local/tomcat/webapps/addressbook.war
 EXPOSE 8080
-CMD /usr/local/tomcat/bin/catalina.sh run
+CMD  ["catalina.sh", "run"]

README.md

@@ -1,7 +1,7 @@
 
  Addressbook Tutorial V2.9
 
-
+hello
 
 This tutorial teaches you some of the basic concepts in [Vaadin Framework](https://vaadin.com). It is meant to be
 a fast read for learning how to get started - not an example on how application should be
@@ -34,6 +34,7 @@ To get the project up and running in IDEA, do:
 
 You should now have a Jetty server running on localhost:8080. Navigate to http://localhost:8080 to play with the application
 
+
 Importing in NetBeans 8
 --------------------
 These instructions were tested on NetBeans 8.0.2. You can get it from https://www.netbeans.org

ansible-deploy-playbook-QA.yaml

@@ -0,0 +1,22 @@
+---
+- name: Check and deploy Docker container
+  hosts: QA
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app

ansible-deploy-playbook-Staging.yaml

@@ -0,0 +1,22 @@
+---
+- name: Check and deploy Docker container
+  hosts: staging
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app

ansible-docker-deploy-playbook.yaml

@@ -0,0 +1,22 @@
+---
+- name: Check and deploy Docker container
+  hosts: QA
+  become: true
+
+  tasks:
+    - name: Check if container is running
+      command: docker ps -q --filter "name=addressbook"
+      register: container_check
+      failed_when: false
+      changed_when: false
+
+    - name: Stop and remove container if running
+      command: docker rm -f addressbook
+      when: container_check.stdout != ""
+
+    - name: Remove image if exists
+      command: docker pull devopsclass2022/address-app
+      ignore_errors: true
+
+    - name: Deploy new container
+      command: docker run -itd -p 7000:8080 --name addressbook devopsclass2022/address-app

java-app-target.yaml

@@ -0,0 +1,17 @@
+---
+- hosts: all 
+#  become: yes
+  tasks:
+#### copy a file
+    - name: copy file
+      copy:
+        src: /var/lib/jenkins/workspace/ansible-jenkins-int/target/addressbook.war
+        dest: /tmp
+    - name: Run Docker container
+      become: true
+      docker_container:
+        name: my_container
+        image: my_image:latest
+        state: started
+        ports:
+          - "9000:80"

jenkinsfile

@@ -0,0 +1,66 @@
+pipeline {
+    agent any
+
+    environment {   
+
+    DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+
+       }
+
+    stages {
+        stage('compile') {
+            steps {
+                echo 'Compiling Stage'
+                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                sh 'mvn compile'
+            }
+        }
+        stage('test') {
+            steps {
+                echo 'Testing Stage'
+                sh 'mvn test'
+            }
+        }
+        stage('package') {
+            steps {
+                echo 'Package Stage'
+                sh 'mvn package'
+            }
+        }
+        stage('Docker Build') {
+            steps {
+                echo 'Docker docker build stage'  
+                sh 'docker build -t devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER} .' 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+
+            }
+        }
+
+
+        stage('Docker Login') {
+            steps {
+
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+                sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+
+            }
+        }
+
+
+
+        stage('Push Image to Dockerhub') {
+            steps {
+                echo 'Docker Registry'
+                sh 'docker push devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
+            }
+        } 
+
+        stage('Clean Up Docker Image') {
+            steps {
+                sh 'docker rmi devopsclass2022/address-app:${JOB_NAME}-${BUILD_NUMBER}'
+            }
+        }
+    }
+
+}

jenkinsfile-16th-april

@@ -0,0 +1,50 @@
+pipeline {
+    agent any
+
+    stages {
+        stage('checkout') {
+            steps {
+                echo 'I am doing a git clone'
+                git 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+            }
+        }
+
+        stage('compile') {
+            steps {
+                sh 'mvn compile'
+            }
+        }
+
+        stage('test') {
+            steps {
+                sh 'mvn test'
+            }
+        }
+
+        stage('package') {
+            steps {
+                sh 'mvn package'
+            }
+        }
+
+        stage('docker build') {
+            steps {
+                sh 'docker build -t devopsclass2022/address-book:${JOB_NAME}-${BUILD_NUMBER} .'
+            }
+        }
+
+        stage('docker login') {
+            steps {
+                sh 'docker login -u devopsclass2022 -p Done24Money@ '
+            }
+        }
+
+        stage('docker push') {
+            steps {
+                sh 'docker push devopsclass2022/address-book:${JOB_NAME}-${BUILD_NUMBER} '
+            }
+        }
+
+
+    }
+}

jenkinsfile-ansible

@@ -0,0 +1,90 @@
+pipeline {
+    agent any
+
+    // environment {   
+
+    // //DOCKERHUB_CREDENTIALS= credentials('docker-hub-credentials')
+
+    //    }
+
+    stages {
+        stage('compile') {
+            steps {
+                echo 'Compiling Stage'
+                git url: 'https://github.com/awsdevopsclass2022/DevOpsClassCodes-aug.git'
+                sh 'mvn compile'
+            }
+        }
+        stage('test') {
+            steps {
+                echo 'Testing Stage'
+                sh 'mvn test'
+            }
+        }
+        stage('package') {
+            steps {
+                echo 'Package Stage'
+                sh 'mvn package'
+            }
+        }
+        stage('Docker Build') {
+            steps {
+                echo 'Docker docker build stage'  
+                sh 'docker build -t devopsclass2022/address-app .' 
+                //sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+
+            }
+        }
+
+
+        stage('Docker Login') {
+            steps {
+
+                  sh 'docker login -u devopsclass2022 -p  Done24Money@' 
+               // sh 'echo $DOCKERHUB_CREDENTIALS_PSW | docker login -u $DOCKERHUB_CREDENTIALS_USR --password-stdin'
+
+            }
+        }
+
+
+        stage('Push Image to Dockerhub') {
+            steps {
+                echo 'Docker Registry'
+                sh 'docker push devopsclass2022/address-app'
+            }
+        } 
+
+        stage('Clean Up Docker Image') {
+            steps {
+                sh 'docker rmi devopsclass2022/address-app'
+            }
+        }
+
+        stage('Deployment to QA (Ansible)') { 
+
+            // when {
+            //     expression { env.BRANCH_NAME == 'orig/development' }
+            // }
+            steps {
+                //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-deploy-playbook-QA.yaml' devops"
+            }
+        }
+
+        stage('Deployment to Staging') { 
+
+            // when {
+            //     expression { env.BRANCH_NAME == 'master' }
+            // }
+
+            steps {
+                //sh 'ansible-playbook ansible-docker-deploy-playbook.yaml'
+                sh "echo 'today@1234' | su -c 'ansible-playbook ansible-deploy-playbook-Staging.yaml' devops"
+            }
+        }
+
+
+    }
+
+}

src/main/java/com/edurekademo/tutorial/addressbook/AddressbookUI.java

@@ -39,6 +39,7 @@ public class AddressbookUI extends UI {
     TextField filter = new TextField();
     Grid contactList = new Grid();
     Button newContact = new Button("New contact");
+    // Button finalContact = new Button("New contact")
 
     // ContactForm is an example of a custom component class
     ContactForm contactForm = new ContactForm();
@@ -76,10 +77,10 @@ private void configureComponents() {
 
         contactList
                 .setContainerDataSource(new BeanItemContainer<>(Contact.class));
-        contactList.setColumnOrder("firstName", "lastName", "email");
-        contactList.removeColumn("id");
+        contactList.setColumnOrder("firstName", "lastName", "email", "phone");
+         contactList.removeColumn("id");
         contactList.removeColumn("birthDate");
-        contactList.removeColumn("phone");
+        // contactList.removeColumn("phone");
         contactList.setSelectionMode(Grid.SelectionMode.SINGLE);
         contactList.addSelectionListener(
                 e -> contactForm.edit((Contact) contactList.getSelectedRow()));
@@ -100,6 +101,7 @@ private void configureComponents() {
     private void buildLayout() {
         HorizontalLayout actions = new HorizontalLayout(filter, newContact);
         actions.setWidth("100%");
+
         filter.setWidth("100%");
         actions.setExpandRatio(filter, 1);