From 04610eb4713c238509e304c31f2d1cf09a4147dc Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Wed, 14 Sep 2022 14:50:09 +0000 Subject: [Datalake/Admin] Fix build issues related to npm Change-Id: I97a92f09e82320b1a4abfe820709baa98443b286 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-3004 Signed-off-by: Vijay Venkatesh Kumar --- components/datalake-handler/Changelog.md | 18 +++ components/datalake-handler/admin/Dockerfile | 21 +++ components/datalake-handler/admin/pom.xml | 157 +++++++++++---------- components/datalake-handler/admin/src/CHANGELOG.md | 11 -- components/datalake-handler/admin/src/package.json | 2 +- 5 files changed, 126 insertions(+), 83 deletions(-) create mode 100644 components/datalake-handler/Changelog.md delete mode 100644 components/datalake-handler/admin/src/CHANGELOG.md (limited to 'components/datalake-handler') diff --git a/components/datalake-handler/Changelog.md b/components/datalake-handler/Changelog.md new file mode 100644 index 00000000..b020ac5f --- /dev/null +++ b/components/datalake-handler/Changelog.md @@ -0,0 +1,18 @@ +# Change Log + +All notable changes to this project will be documented in this file. + +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 6237741a..4c659598 100644 --- 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 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 7cc30d78..62b574f2 100644 --- a/components/datalake-handler/admin/pom.xml +++ b/components/datalake-handler/admin/pom.xml @@ -1,26 +1,41 @@ + - 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"> + 4.0.0 - - org.onap.dcaegen2.services.components - datalake-handler - 1.1.1-SNAPSHOT - + + org.onap.dcaegen2.services.components + datalake-handler + 1.1.1-SNAPSHOT + - org.onap.dcaegen2.services.components.datalake-handler - admin - pom - - 2.9.2 - 1.4.5 - onap/org.onap.dcaegen2.services.datalakeadminui - yyyyMMdd'T'HHmmss - - DataLake Admin - + org.onap.dcaegen2.services.components.datalake-handler + admin + pom + + 2.9.2 + 1.4.5 + onap/org.onap.dcaegen2.services.datalakeadminui + yyyyMMdd'T'HHmmss + -changelog-missing + + DataLake Admin + com.spotify @@ -30,58 +45,58 @@ ${onap.nexus.dockerregistry.daily}/${docker.image.path} ${project.version} Dockerfile - - - - build-datalake-admin-ui-image - package - - build - - - true - - - - tag-and-push-image-latest - package - - tag - push - - - ${onap.nexus.dockerregistry.daily}/${docker.image.path} - latest - true - - - - tag-and-push-image-with-version - package - - tag - push - - - ${onap.nexus.dockerregistry.daily}/${docker.image.path} - ${project.version} - true - - - - tag-and-push-image-with-version-and-date - package - - tag - push - - - ${onap.nexus.dockerregistry.daily}/${docker.image.path} - ${project.version}-${maven.build.timestamp}Z - true - - - + + + + build-datalake-admin-ui-image + package + + build + + + true + + + + tag-and-push-image-latest + package + + tag + push + + + ${onap.nexus.dockerregistry.daily}/${docker.image.path} + latest + true + + + + tag-and-push-image-with-version + package + + tag + push + + + ${onap.nexus.dockerregistry.daily}/${docker.image.path} + ${project.version} + true + + + + tag-and-push-image-with-version-and-date + package + + tag + push + + + ${onap.nexus.dockerregistry.daily}/${docker.image.path} + ${project.version}-${maven.build.timestamp}Z + true + + + javax.activation diff --git a/components/datalake-handler/admin/src/CHANGELOG.md b/components/datalake-handler/admin/src/CHANGELOG.md deleted file mode 100644 index 0cf0870a..00000000 --- a/components/datalake-handler/admin/src/CHANGELOG.md +++ /dev/null @@ -1,11 +0,0 @@ -# [0.0.0](https://gerrit.onap.org/r/dcaegen2/services/compare/4.0.0-ONAP...0.0.0) (2019-08-01) - - -### 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/src/package.json b/components/datalake-handler/admin/src/package.json index d4e0444c..a3803f37 100644 --- 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", -- cgit 1.2.3-korg