summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/Dockerfile (renamed from vnfmarket-be/deployment/docker-postgres/Dockerfile)0
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql (renamed from vnfmarket-be/deployment/docker-postgres/marketplace_tables_postgres.sql)0
-rw-r--r--vnfmarket-be/deployment/docker/docker-postgres/pom.xml (renamed from vnfmarket-be/deployment/docker-postgres/pom.xml)2
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/pom.xml105
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile (renamed from vnfmarket-be/deployment/docker/src/main/docker/Dockerfile)0
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/LICENSE (renamed from vnfmarket-be/deployment/docker/src/main/docker/LICENSE)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/init-mysql.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-config.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh)0
-rwxr-xr-xvnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-workaround.sh (renamed from vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh)0
-rw-r--r--vnfmarket-be/deployment/docker/pom.xml81
-rw-r--r--vnfmarket-be/deployment/pom.xml3
14 files changed, 115 insertions, 76 deletions
diff --git a/vnfmarket-be/deployment/docker-postgres/Dockerfile b/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile
index 704d08c3..704d08c3 100644
--- a/vnfmarket-be/deployment/docker-postgres/Dockerfile
+++ b/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile
diff --git a/vnfmarket-be/deployment/docker-postgres/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql
index edd66813..edd66813 100644
--- a/vnfmarket-be/deployment/docker-postgres/marketplace_tables_postgres.sql
+++ b/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql
diff --git a/vnfmarket-be/deployment/docker-postgres/pom.xml b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
index 953ef8cd..866e7b2a 100644
--- a/vnfmarket-be/deployment/docker-postgres/pom.xml
+++ b/vnfmarket-be/deployment/docker/docker-postgres/pom.xml
@@ -24,7 +24,7 @@
<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>refrepo-docker-postgres</artifactId>
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
new file mode 100644
index 00000000..16bea662
--- /dev/null
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -0,0 +1,105 @@
+<?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</artifactId>
+ <name>vnfmarket/deployment/docker/refrepo</name>
+ <packaging>pom</packaging>
+
+ <properties>
+ <docker.image.name>onap/refrepo</docker.image.name>
+ <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>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.4.11</version>
+ <configuration>
+ <verbose>true</verbose>
+ <imageName>${docker.image.name}</imageName>
+ <serverId>docker-hub</serverId>
+ <dockerDirectory>${basedir}/src/main/docker</dockerDirectory>
+ <resources>
+ <resource>
+ <targetPath>/STAGE</targetPath>
+ <directory>${basedir}/../../zip/target/deployunzip</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ <executions>
+ <execution>
+ <id>build-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ <configuration>
+ <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-image-timestamped-version</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>${docker.image.name}</image>
+ <newName>${docker.push.registry}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
+ <pushImage>${skip.docker.push}</pushImage>
+ <skipDockerTag>${skip.docker.tag}</skipDockerTag>
+ </configuration>
+ </execution>
+ <execution>
+ <id>tag-image-latest-version</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>tag</goal>
+ </goals>
+ <configuration>
+ <image>${docker.image.name}</image>
+ <newName>${docker.push.registry}/${docker.image.name}:latest</newName>
+ <pushImage>${skip.docker.push}</pushImage>
+ <skipDockerTag>${skip.docker.tag}</skipDockerTag>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
index 22ced94a..22ced94a 100644
--- a/vnfmarket-be/deployment/docker/src/main/docker/Dockerfile
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/LICENSE b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/LICENSE
index bebcc7f8..bebcc7f8 100644
--- a/vnfmarket-be/deployment/docker/src/main/docker/LICENSE
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/LICENSE
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
index 4dba1a4f..4dba1a4f 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/docker-entrypoint.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/docker-entrypoint.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/init-mysql.sh
index 4b925cc0..4b925cc0 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/init-mysql.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/init-mysql.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-config.sh
index 7a5327ac..7a5327ac 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-config.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-config.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
index 25a22581..25a22581 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-init.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-init.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh
index e2b0544b..e2b0544b 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-run.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh
diff --git a/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-workaround.sh
index 40058f56..40058f56 100755
--- a/vnfmarket-be/deployment/docker/src/main/docker/instance-workaround.sh
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-workaround.sh
diff --git a/vnfmarket-be/deployment/docker/pom.xml b/vnfmarket-be/deployment/docker/pom.xml
index 0caf55d5..c654a496 100644
--- a/vnfmarket-be/deployment/docker/pom.xml
+++ b/vnfmarket-be/deployment/docker/pom.xml
@@ -22,84 +22,19 @@
<parent>
<groupId>org.onap.vnfsdk.refrepo</groupId>
- <artifactId>vnf-sdk-marketplace-core-parent</artifactId>
+ <artifactId>vnfmarket-deployment</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>vnfmarket-docker</artifactId>
+ <artifactId>vnfmarket-deployment-docker</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<name>vnfmarket/deployment/docker</name>
<packaging>pom</packaging>
- <properties>
- <docker.image.name>onap/refrepo</docker.image.name>
- <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>
- </properties>
+ <modules>
+ <module>docker-refrepo</module>
+ <module>docker-postgres</module>
+ </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.4.11</version>
- <configuration>
- <verbose>true</verbose>
- <imageName>${docker.image.name}</imageName>
- <serverId>docker-hub</serverId>
- <dockerDirectory>${basedir}/src/main/docker</dockerDirectory>
- <resources>
- <resource>
- <targetPath>/STAGE</targetPath>
- <directory>${basedir}/../zip/target/deployunzip</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- <executions>
- <execution>
- <id>build-image</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- <configuration>
- <skipDockerBuild>${skip.docker.build}</skipDockerBuild>
- </configuration>
- </execution>
- <execution>
- <id>tag-image-timestamped-version</id>
- <phase>deploy</phase>
- <goals>
- <goal>tag</goal>
- </goals>
- <configuration>
- <image>${docker.image.name}</image>
- <newName>${docker.push.registry}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName>
- <pushImage>${skip.docker.push}</pushImage>
- <skipDockerTag>${skip.docker.tag}</skipDockerTag>
- </configuration>
- </execution>
- <execution>
- <id>tag-image-latest-version</id>
- <phase>deploy</phase>
- <goals>
- <goal>tag</goal>
- </goals>
- <configuration>
- <image>${docker.image.name}</image>
- <newName>${docker.push.registry}/${docker.image.name}:latest</newName>
- <pushImage>${skip.docker.push}</pushImage>
- <skipDockerTag>${skip.docker.tag}</skipDockerTag>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/vnfmarket-be/deployment/pom.xml b/vnfmarket-be/deployment/pom.xml
index 1397d386..7fce148c 100644
--- a/vnfmarket-be/deployment/pom.xml
+++ b/vnfmarket-be/deployment/pom.xml
@@ -34,8 +34,7 @@
<modules>
<module>zip</module>
- <module>docker</module>
- <module>docker-postgres</module>
+ <module>docker</module>
</modules>
</project>