summaryrefslogtreecommitdiffstats
path: root/installation/admportal
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-01 17:40:45 -0400
committerDan Timoney <dtimoney@att.com>2017-09-01 17:40:45 -0400
commit98ddb133dec262b727b93eab40f384b88fed864a (patch)
tree23cb613d1668a917efaacd9e706e92aff0b162f7 /installation/admportal
parentc085b94fff42885e0f97ee0521de6f401f39e030 (diff)
Build sdnc/oam from ccsdk
Update sdnc/oam to build from ccsdk. To get a clean build, it was necessary to also change openecomp references to onap. Change-Id: I90d939e77504cd58148889aff2a50f060e27f963 Issue-ID: SDNC-50 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: e391e1e3ca8ea5385bb1f77ed7c4c83935451575
Diffstat (limited to 'installation/admportal')
-rw-r--r--installation/admportal/pom.xml20
-rw-r--r--installation/admportal/src/main/docker/Dockerfile2
2 files changed, 11 insertions, 11 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml
index 3476b6f0..bb607147 100644
--- a/installation/admportal/pom.xml
+++ b/installation/admportal/pom.xml
@@ -3,22 +3,22 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.openecomp.sdnc.oam</groupId>
+ <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <groupId>org.openecomp.sdnc.oam</groupId>
+ <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<name>Installation - admportal</name>
<description>Creates admportal Docker container</description>
<properties>
- <image.name>openecomp/admportal-sdnc-image</image.name>
+ <image.name>onap/admportal-sdnc-image</image.name>
<sdnc.project.version>${project.version}</sdnc.project.version>
</properties>
@@ -130,7 +130,7 @@
</goals><!-- here the phase you need -->
<phase>validate</phase>
<configuration>
- <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+ <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
<resources>
<resource>
<directory>../src/main/properties</directory>
@@ -160,7 +160,7 @@
<executable>/usr/bin/unzip</executable>
<arguments>
<argument>-d</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
<argument>../../admportal/target/*.zip</argument>
</arguments>
</configuration>
@@ -176,7 +176,7 @@
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.json</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
@@ -191,7 +191,7 @@
<executable>/bin/cp</executable>
<arguments>
<argument>../../admportal/config/admportal.log4js.json</argument>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument>
</arguments>
</configuration>
</execution>
@@ -206,7 +206,7 @@
<configuration>
<executable>/usr/bin/find</executable>
<arguments>
- <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+ <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
<argument>-name</argument>
<argument>*.sh</argument>
<argument>-exec</argument>
diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile
index 4006af3e..fadb8120 100644
--- a/installation/admportal/src/main/docker/Dockerfile
+++ b/installation/admportal/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
# Base ubuntu with added packages needed for open ecomp
-FROM openecomp/ubuntu-sdnc-image:${project.version}
+FROM onap/ccsdk-ubuntu-image:${ccsdk.distribution.version}
MAINTAINER SDN-C Team (sdnc@lists.openecomp.org)
# create link for pm2