diff options
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-postgres/pom.xml | 113 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile (renamed from vnfmarket-be/deployment/docker/docker-postgres/Dockerfile) | 0 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql (renamed from vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql) | 0 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/pom.xml (renamed from vnfmarket-be/deployment/docker/pom.xml) | 74 | ||||
| -rw-r--r-- | vnfmarket-be/deployment/pom.xml | 3 |
5 files changed, 122 insertions, 68 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml new file mode 100644 index 00000000..036b59c1 --- /dev/null +++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2017 Huawei Technologies Co., Ltd. + + 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. + --> +<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.vnfsdk.refrepo</groupId> + <artifactId>vnf-sdk-marketplace-core-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <artifactId>vnfmarket-docker-refrepo-postgres</artifactId> + <name>vnfmarket/deployment/docker/postgres</name> + <packaging>pom</packaging> + + <properties> + <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + <docker.push.registry></docker.push.registry> + <skip.docker.build>true</skip.docker.build> + <skip.docker.tag>true</skip.docker.tag> + <skip.docker.push>true</skip.docker.push> + <docker.skip>false</docker.skip> + <docker.skip.build>false</docker.skip.build> + </properties> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.7</version> + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <skipDocker>${docker.skip}</skipDocker> + <images> + <image> + <name>onap/refrepo/postgres</name> + <alias>postgres</alias> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}</dockerFileDir> + <dockerFile>${basedir}/src/main/docker/Dockerfile</dockerFile> + + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>clean-images</id> + <phase>pre-clean</phase> + <goals> + <goal>remove</goal> + </goals> + <configuration> + <removeAll>true</removeAll> + <image>onap/refrepo/postgres</image> + </configuration> + </execution> + + <execution> + <id>generate-images</id> + <phase>generate-sources</phase> + <goals> + <goal>build</goal> + </goals> + <configuration> + <skipDockerBuild>${docker.skip.build}</skipDockerBuild> + </configuration> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + <configuration> + <image>onap/refrepo/postgres</image> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> +</profiles> +</project> diff --git a/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile index 704d08c3..704d08c3 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile diff --git a/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql index edd66813..edd66813 100644 --- a/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql +++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql diff --git a/vnfmarket-be/deployment/docker/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml index f620036a..a3f2d8a7 100644 --- a/vnfmarket-be/deployment/docker/pom.xml +++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml @@ -24,11 +24,11 @@ <groupId>org.onap.vnfsdk.refrepo</groupId> <artifactId>vnf-sdk-marketplace-core-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> + <relativePath>../../../pom.xml</relativePath> </parent> <artifactId>vnfmarket-docker-refrepo</artifactId> - <name>vnfmarket/deployment/docker</name> + <name>vnfmarket/deployment/docker/refrepo</name> <packaging>pom</packaging> <properties> @@ -37,7 +37,8 @@ <skip.docker.build>true</skip.docker.build> <skip.docker.tag>true</skip.docker.tag> <skip.docker.push>true</skip.docker.push> - <docker.skip>true</docker.skip> + <docker.skip>false</docker.skip> + <docker.skip.build>false</docker.skip.build> </properties> <build> @@ -50,11 +51,11 @@ <verbose>true</verbose> <imageName>onap/refrepo</imageName> <serverId>docker-hub</serverId> - <dockerDirectory>${basedir}/docker-refrepo/src/main/docker</dockerDirectory> + <dockerDirectory>${basedir}/src/main/docker</dockerDirectory> <resources> <resource> <targetPath>/STAGE</targetPath> - <directory>${basedir}/../zip/target/deployunzip</directory> + <directory>${basedir}/../../zip/target/deployunzip</directory> <includes> <include>**/*</include> </includes> @@ -102,68 +103,7 @@ </executions> </plugin> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.7</version> - <configuration> - <verbose>true</verbose> - <apiVersion>1.23</apiVersion> - <skipDocker>${docker.skip}</skipDocker> - <images> - <image> - <name>onap/refrepo/postgres</name> - <alias>postgres</alias> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/docker-postgres</dockerFileDir> - <dockerFile>${basedir}/docker-postgres/Dockerfile</dockerFile> - - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>clean-images</id> - <phase>pre-clean</phase> - <goals> - <goal>remove</goal> - </goals> - <configuration> - <removeAll>true</removeAll> - <image>onap/refrepo/postgres</image> - </configuration> - </execution> - - <execution> - <id>generate-images</id> - <phase>generate-sources</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - <configuration> - <image>onap/refrepo/postgres</image> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> + </plugins> </build> diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml index 7fce148c..5841c313 100644 --- a/vnfmarket-be/deployment/pom.xml +++ b/vnfmarket-be/deployment/pom.xml @@ -34,7 +34,8 @@ <modules> <module>zip</module> - <module>docker</module> + <module>docker/docker-postgres</module> + <module>docker/docker-refrepo</module> </modules> </project> |