From 4439db95482aadd2818944e9327229cb1a7aed70 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Fri, 18 Jun 2021 12:03:09 -0400
Subject: Effort to reduce image layer and size

Removing few ENV version variable and those should be read
from pom properties (maven-resource-plugin filtering true)

Combined Dockerfile and Standalone.Dockerfile

Adding Docker build arg AAF which will decide whether to add
aaa-app-config.xml in docker image or not for standalone

Updated docker-maven-plugin to 0.34.0 to have noCache true

Removing start-it-container execution as it's being tested by CSIT

Replacing maven-exec-plugin with maven-antrun-plugin

Updating latest base docker images versions

Updating parent version to 2.1.7

Issue-ID: CCSDK-3226
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I68f8f4780804a2014b73b5eeb9dba29d1896a602

Former-commit-id: 4e674166ebefa6c8d9d929cc279ef175191f137b
---
 .../vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configbackuprestore/vnfconfigbackupservice')

diff --git a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
index 95b64141..c9a00b08 100644
--- a/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
+++ b/configbackuprestore/vnfconfigbackupservice/src/main/webapp/WEB-INF/views/index.jsp
@@ -34,7 +34,7 @@
       <script src = "./node_modules/angular.min.js"></script>
       <script src = "./node_modules/angular-route.min.js"></script>
       <script src="./node_modules/angular-utils-pagination/dirPagination.js"></script>
-      <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>     
+      <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
       <script src="./node_modules/angular-sanitize.min.js"></script>
       <link rel="stylesheet" href="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.css" />
       <script src="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.js"></script>
@@ -61,7 +61,7 @@
    <div class="container">
       <!-- header page -->
    <div ng-include="'static/views/header.html'"></div>
-      <div style="border-style:ridge;height:auto;">          
+      <div style="border-style:ridge;height:auto;">
          <div ng-include="'static/views/tabs.html'" ></div>
          <!-- views will be injected here -->
          <div ng-view></div>
@@ -70,4 +70,4 @@
        <div ng-include="'static/views/footer.html'" ></div>
        </div>
    </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit 1.2.3-korg