[Datalake/Admin] Fix build issues related to npm

Change-Id: I97a92f09e82320b1a4abfe820709baa98443b286
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-3004
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>

diff --git a/components/datalake-handler/admin/src/CHANGELOG.md b/components/datalake-handler/Changelog.md
similarity index 55%
rename from components/datalake-handler/admin/src/CHANGELOG.md
rename to components/datalake-handler/Changelog.md
index 0cf0870..b020ac5 100644 (file)
--- a/components/datalake-handler/admin/src/CHANGELOG.md
+++ b/components/datalake-handler/Changelog.md
@@ -1,11 +1,18 @@
-# [0.0.0](https://gerrit.onap.org/r/dcaegen2/services/compare/4.0.0-ONAP...0.0.0) (2019-08-01)
+# Change Log
 
+All notable changes to this project will be documented in this file.
 
-### Features
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.1.1] 2022-09-14
+* DCAEGEN2-3004 - Fix DL-Admin Docker docker build issue
 
+## [1.0.0] 2019-08-01
+### Initial DL-Admin UI code
+### Features
 * add button component ([9e04f08](https://gerrit.onap.org/r/dcaegen2/services/commits/9e04f08))
 * add database to design module ([eba414f](https://gerrit.onap.org/r/dcaegen2/services/commits/eba414f))
 * change the structure of the project ([f761909](https://gerrit.onap.org/r/dcaegen2/services/commits/f761909))
 * new changes for design module ([c4c391b](https://gerrit.onap.org/r/dcaegen2/services/commits/c4c391b))
 
-

diff --git a/components/datalake-handler/admin/Dockerfile b/components/datalake-handler/admin/Dockerfile
index 6237741..4c65959 100644 (file)
--- a/components/datalake-handler/admin/Dockerfile
+++ b/components/datalake-handler/admin/Dockerfile
@@ -1,9 +1,30 @@
+# ============LICENSE_START=======================================================
+#  Copyright (c) 2019 QCT. All rights reserved.
+#  Copyright (c) 2022 AT&T. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+
 FROM node:alpine AS builder
 MAINTAINER Ekko Chang <ekko.chang@qct.io>
 
 LABEL org.label-schema.docker.build="docker build -t dl-admin . --no-cache" \
       org.label-schema.docker.run="docker run -p 80:80 --add-host=dl_feeder:your_feeder_ipaddress dl-admin"
 
+ENV NODE_OPTIONS "--openssl-legacy-provider"
+
 WORKDIR /app
 COPY ./src .
 COPY ./nginx .

diff --git a/components/datalake-handler/admin/pom.xml b/components/datalake-handler/admin/pom.xml
index 7cc30d7..62b574f 100644 (file)
--- a/components/datalake-handler/admin/pom.xml
+++ b/components/datalake-handler/admin/pom.xml
@@ -1,26 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    ============LICENSE_START=======================================================
+    Copyright (c) 2019 QCT. All rights reserved.
+    Copyright (c) 2022 AT&T. All rights reserved.
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License"); you may not
+    use this file except in compliance with the License. You may obtain a copy
+    of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+    by applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+    OF ANY KIND, either express or implied. See the License for the specific
+    language governing permissions and limitations under the License.
+    ============LICENSE_END=========================================================
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.dcaegen2.services.components</groupId>
-               <artifactId>datalake-handler</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.dcaegen2.services.components</groupId>
+        <artifactId>datalake-handler</artifactId>
+        <version>1.1.1-SNAPSHOT</version>
+    </parent>
 
-       <groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
-       <artifactId>admin</artifactId>
-       <packaging>pom</packaging>
-       <properties>
-               <swagger.version>2.9.2</swagger.version>
-               <dockerfile-maven.version>1.4.5</dockerfile-maven.version>
-               <docker.image.path>onap/org.onap.dcaegen2.services.datalakeadminui</docker.image.path>
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
-       </properties>
-       <name>DataLake Admin</name>
-       <build>
+    <groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
+    <artifactId>admin</artifactId>
+    <packaging>pom</packaging>
+    <properties>
+        <swagger.version>2.9.2</swagger.version>
+        <dockerfile-maven.version>1.4.5</dockerfile-maven.version>
+        <docker.image.path>onap/org.onap.dcaegen2.services.datalakeadminui</docker.image.path>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+        <onap-gerrit-review>-changelog-missing</onap-gerrit-review>
+    </properties>
+    <name>DataLake Admin</name>
+    <build>
                 <plugins>
                         <plugin>
                                 <groupId>com.spotify</groupId>
@@ -30,58 +45,58 @@
                                     <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
                                     <tag>${project.version}</tag>
                                     <dockerfile>Dockerfile</dockerfile>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>build-datalake-admin-ui-image</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>build</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>tag-and-push-image-latest</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>tag</goal>
-                                                       <goal>push</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
-                                                       <tag>latest</tag>
-                                                       <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>tag-and-push-image-with-version</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>tag</goal>
-                                                       <goal>push</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
-                                                       <tag>${project.version}</tag>
-                                                       <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>tag-and-push-image-with-version-and-date</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>tag</goal>
-                                                       <goal>push</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
-                                                       <tag>${project.version}-${maven.build.timestamp}Z</tag>
-                                                       <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
-                                               </configuration>
-                                       </execution>
-                               </executions>
+                    </configuration>
+                <executions>
+                    <execution>
+                        <id>build-datalake-admin-ui-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                        <configuration>
+                            <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>tag-and-push-image-latest</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>tag</goal>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+                                <tag>latest</tag>
+                            <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>tag-and-push-image-with-version</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>tag</goal>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+                            <tag>${project.version}</tag>
+                            <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>tag-and-push-image-with-version-and-date</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>tag</goal>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <repository>${onap.nexus.dockerregistry.daily}/${docker.image.path}</repository>
+                            <tag>${project.version}-${maven.build.timestamp}Z</tag>
+                            <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
+                        </configuration>
+                    </execution>
+                </executions>
                                 <dependencies>
                                         <dependency>
                                                 <groupId>javax.activation</groupId>

diff --git a/components/datalake-handler/admin/src/package.json b/components/datalake-handler/admin/src/package.json
index d4e0444..a3803f3 100644 (file)
--- a/components/datalake-handler/admin/src/package.json
+++ b/components/datalake-handler/admin/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DataLake-AdminUI",
-  "version": "0.0.0",
+  "version": "1.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host='0.0.0.0' --proxy-config proxy.conf.json",