diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/admportal/pom.xml | 233 | ||||
| -rw-r--r-- | installation/admportal/src/main/docker/Dockerfile | 14 | ||||
| -rw-r--r-- | installation/ansible-server/pom.xml | 2 | ||||
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 2 | ||||
| -rw-r--r-- | installation/pom.xml | 2 | ||||
| -rw-r--r-- | installation/sdnc-web/pom.xml | 2 | ||||
| -rw-r--r-- | installation/ueb-listener/pom.xml | 2 |
7 files changed, 5 insertions, 252 deletions
diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml deleted file mode 100644 index b8256a6e..00000000 --- a/installation/admportal/pom.xml +++ /dev/null @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - - <parent> - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation</artifactId> - <version>2.0.1-SNAPSHOT</version> - </parent> - - <groupId>org.onap.sdnc.oam</groupId> - <artifactId>installation-admportal</artifactId> - <version>2.0.1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>sdnc-oam :: installation :: ${project.artifactId}</name> - <description>Creates admportal Docker container</description> - <organization> - <name>openECOMP</name> - </organization> - - <properties> - <image.name>onap/admportal-sdnc-image</image.name> - <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.docker.version>0.7-STAGING-latest</ccsdk.docker.version> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../TagVersion.groovy</source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> - <inherited>false</inherited> - <configuration> - - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>Dockerfile</dockerFile> - <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>process-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-properties</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory> - <resources> - <resource> - <directory>../src/main/properties</directory> - <includes> - <include>*.properties</include> - <include>*.properties.sdnctldb01</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-keystores</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory> - <resources> - <resource> - <directory>../src/main/stores</directory> - <includes> - <include>*.p12</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - <execution> - <id>Unzip admportal</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/unzip</executable> - <arguments> - <argument>-d</argument> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> - <argument>../../admportal/target/*.zip</argument> - </arguments> - </configuration> - </execution> - - <execution> - <id>Copy admportal config</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>../../admportal/config/admportal.json</argument> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument> - </arguments> - </configuration> - </execution> - - <execution> - <id>Copy admportal config1</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/cp</executable> - <arguments> - <argument>../../admportal/config/admportal.log4js.json</argument> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</argument> - </arguments> - </configuration> - </execution> - - - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - - - </plugins> - </build> -</project> diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile deleted file mode 100644 index f5b51d1f..00000000 --- a/installation/admportal/src/main/docker/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} -MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) - -# create link for pm2 -#RUN ln -s /opt/openecomp/sdnc/admportal/node_modules/pm2/bin/pm2 /usr/bin/pm2 - -# copy openecomp -COPY opt /opt - -RUN cd /opt/onap/sdnc/admportal && npm install - -#ENTRYPOINT exec /opt/openecomp/sdnc/admportal/shell/startssl.sh -EXPOSE 8843 8443 diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 72e3ff28..869544af 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -23,7 +23,7 @@ <image.name>onap/sdnc-ansible-server-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.docker.version>1.0-STAGING-latest</ccsdk.docker.version> + <ccsdk.docker.version>1.1.3</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 8d958212..9a96be30 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -23,7 +23,7 @@ <image.name>onap/sdnc-dmaap-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.docker.version>1.1.1</ccsdk.docker.version> + <ccsdk.docker.version>1.1.3</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> diff --git a/installation/pom.xml b/installation/pom.xml index 7970fc9a..6ab5dfa5 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -29,7 +29,7 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> - <ccsdk.distribution.version>1.0.1</ccsdk.distribution.version> + <ccsdk.distribution.version>1.1.3</ccsdk.distribution.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 6156b062..38deae08 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -20,7 +20,7 @@ <base.image.repo>docker.io/bitnami/nginx:1.16-debian-9</base.image.repo> <image.name>onap/sdnc-web-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <ccsdk.features.version>1.1.2</ccsdk.features.version> + <ccsdk.features.version>1.1.3</ccsdk.features.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index b72d0a87..b3aefcc9 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -23,7 +23,7 @@ <image.name>onap/sdnc-ueb-listener-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp> - <ccsdk.docker.version>1.1.1</ccsdk.docker.version> + <ccsdk.docker.version>1.1.3</ccsdk.docker.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <docker.push.phase>deploy</docker.push.phase> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> |