From 5fe29a25ae58319013253c1871ad20adb1b83b46 Mon Sep 17 00:00:00 2001
From: Murali <murali.p@huawei.com>
Date: Thu, 14 Sep 2017 06:17:44 +0000
Subject: Add profile to build postgres docker

Change-Id: I564d868a98a7518773ea9ac7331eeb2047818d78
Jira:VNFSDK-77
Signed-off-by: Murali <murali.p@huawei.com>
---
 .../deployment/docker/docker-postgres/Dockerfile   |  13 --
 .../marketplace_tables_postgres.sql                |  24 ---
 .../deployment/docker/docker-postgres/pom.xml      | 113 ++++++++++++++
 .../docker-postgres/src/main/docker/Dockerfile     |  13 ++
 .../main/docker/marketplace_tables_postgres.sql    |  24 +++
 .../deployment/docker/docker-refrepo/pom.xml       | 110 +++++++++++++
 vnfmarket-be/deployment/docker/pom.xml             | 170 ---------------------
 vnfmarket-be/deployment/pom.xml                    |   3 +-
 8 files changed, 262 insertions(+), 208 deletions(-)
 delete mode 100644 vnfmarket-be/deployment/docker/docker-postgres/Dockerfile
 delete mode 100644 vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql
 create mode 100644 vnfmarket-be/deployment/docker/docker-postgres/pom.xml
 create mode 100644 vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile
 create mode 100644 vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql
 create mode 100644 vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
 delete mode 100644 vnfmarket-be/deployment/docker/pom.xml

(limited to 'vnfmarket-be/deployment')

diff --git a/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile b/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile
deleted file mode 100644
index 704d08c3..00000000
--- a/vnfmarket-be/deployment/docker/docker-postgres/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually.
-#
-# vnf-sdk-marketplace/target/Dockerfile
-#
-
-# 10-basebuild.txt
-
-FROM postgres:9.4
-ENV POSTGRES_USER postgres
-ENV POSTGRES_PASSWORD postgres
-ADD marketplace_tables_postgres.sql  /docker-entrypoint-initdb.d
-
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql
deleted file mode 100644
index edd66813..00000000
--- a/vnfmarket-be/deployment/docker/docker-postgres/marketplace_tables_postgres.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-CREATE DATABASE "marketplaceDB";
-
-\c marketplaceDB;
-
-DROP TABLE IF EXISTS CSAR_PACKAGE_TABLE;
-
-CREATE TABLE CSAR_PACKAGE_TABLE (
-	CSARID                   VARCHAR(200)       NOT NULL,
-	DOWNLOADURI              VARCHAR(200)       NULL,
-	REPORT		             VARCHAR(200)       NULL,
-	SIZE                     VARCHAR(100)       NULL,
-	FORMAT                   VARCHAR(100)       NULL,
-	CREATETIME               VARCHAR(100)       NULL,
-	DELETIONPENDING          VARCHAR(100)       NULL,
-	MODIFYTIME               VARCHAR(100)       NULL,
-	SHORTDESC	             TEXT		        NULL,
-	NAME                     VARCHAR(100)       NULL,
-	VERSION                  VARCHAR(20)        NULL,
-	PROVIDER                 VARCHAR(300)       NULL,
-	TYPE                     VARCHAR(300)       NULL,
-	DETAILS		             TEXT			    NULL,
-	REMARKS		             TEXT			    NULL,
-	DOWNLOADCOUNT            INT                NULL
-);
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/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile
new file mode 100644
index 00000000..704d08c3
--- /dev/null
+++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/Dockerfile
@@ -0,0 +1,13 @@
+#
+# This file was auto-generated by gen-all-dockerfiles.sh; do not modify manually.
+#
+# vnf-sdk-marketplace/target/Dockerfile
+#
+
+# 10-basebuild.txt
+
+FROM postgres:9.4
+ENV POSTGRES_USER postgres
+ENV POSTGRES_PASSWORD postgres
+ADD marketplace_tables_postgres.sql  /docker-entrypoint-initdb.d
+
diff --git a/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql
new file mode 100644
index 00000000..edd66813
--- /dev/null
+++ b/vnfmarket-be/deployment/docker/docker-postgres/src/main/docker/marketplace_tables_postgres.sql
@@ -0,0 +1,24 @@
+CREATE DATABASE "marketplaceDB";
+
+\c marketplaceDB;
+
+DROP TABLE IF EXISTS CSAR_PACKAGE_TABLE;
+
+CREATE TABLE CSAR_PACKAGE_TABLE (
+	CSARID                   VARCHAR(200)       NOT NULL,
+	DOWNLOADURI              VARCHAR(200)       NULL,
+	REPORT		             VARCHAR(200)       NULL,
+	SIZE                     VARCHAR(100)       NULL,
+	FORMAT                   VARCHAR(100)       NULL,
+	CREATETIME               VARCHAR(100)       NULL,
+	DELETIONPENDING          VARCHAR(100)       NULL,
+	MODIFYTIME               VARCHAR(100)       NULL,
+	SHORTDESC	             TEXT		        NULL,
+	NAME                     VARCHAR(100)       NULL,
+	VERSION                  VARCHAR(20)        NULL,
+	PROVIDER                 VARCHAR(300)       NULL,
+	TYPE                     VARCHAR(300)       NULL,
+	DETAILS		             TEXT			    NULL,
+	REMARKS		             TEXT			    NULL,
+	DOWNLOADCOUNT            INT                NULL
+);
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..a3f2d8a7
--- /dev/null
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/pom.xml
@@ -0,0 +1,110 @@
+<?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>    
+        <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>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.11</version>
+                <configuration>
+                    <verbose>true</verbose>
+                    <imageName>onap/refrepo</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>onap/refrepo</image>
+                            <newName>${docker.push.registry}/onap/refrepo:${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>onap/refrepo</image>
+                            <newName>${docker.push.registry}/onap/refrepo: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/pom.xml b/vnfmarket-be/deployment/docker/pom.xml
deleted file mode 100644
index f620036a..00000000
--- a/vnfmarket-be/deployment/docker/pom.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?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</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>true</docker.skip>
-  </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.11</version>
-                <configuration>
-                    <verbose>true</verbose>
-                    <imageName>onap/refrepo</imageName>
-                    <serverId>docker-hub</serverId>
-                    <dockerDirectory>${basedir}/docker-refrepo/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>onap/refrepo</image>
-                            <newName>${docker.push.registry}/onap/refrepo:${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>onap/refrepo</image>
-                            <newName>${docker.push.registry}/onap/refrepo:latest</newName>
-                            <pushImage>${skip.docker.push}</pushImage>
-                            <skipDockerTag>${skip.docker.tag}</skipDockerTag>
-                        </configuration>
-                    </execution>
-                                  
-                </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>
-</project>
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>
-- 
cgit 1.2.3-korg