Merge "Add simulator to docker-compose.yml"

4 files changed, 78 insertions, 5 deletions

diff --git a/deliveries/.gitignore b/deliveries/.gitignore
new file mode 100644
index 000000000..54a4f4f69
--- /dev/null
+++ b/deliveries/.gitignore
@@ -0,0 +1,2 @@
+# provide developers possibility to add or override custom properties in compose without polluting code base
+docker-compose.override.yml
\ No newline at end of file
diff --git a/deliveries/src/main/docker/docker-files/docker-compose.yml b/deliveries/src/main/docker/docker-files/docker-compose.yml
index 644590191..eedf7322e 100755
--- a/deliveries/src/main/docker/docker-files/docker-compose.yml
+++ b/deliveries/src/main/docker/docker-files/docker-compose.yml
@@ -1,15 +1,21 @@
-version: '3.1'

+version: '3.2'

+

+# Please note this configuration is provided for local development. Do not use it on production.

 

 services:

     vid-server:

-        image: nexus3.onap.org:10001/onap/vid

+        image: onap/vid:latest

         ports:

             - "8080:8080"

-        links:

-            - vid-mariadb:vid-mariadb-docker-instance

         environment:

             VID_MYSQL_DBNAME: vid_openecomp_epsdk

             VID_MYSQL_PASS: YOUR_PASSWORD

+            VID_MYSQL_HOST: vid-mariadb

+            ASDC_CLIENT_REST_PROTOCOL: http

+            ASDC_CLIENT_REST_HOST: vid-simulator

+            ASDC_CLIENT_REST_PORT: 1080

+            VID_AAI_URL: http://vid-simulator:1080

+            VID_MSO_SERVER_URL: http://vid-simulator:1080

 

     vid-mariadb:

         image: mariadb:10

@@ -22,4 +28,7 @@ services:
             MYSQL_DATABASE: vid_openecomp_epsdk

             MYSQL_USER: vidadmin

             MYSQL_PASSWORD: YOUR_PASSWORD

-            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD
\ No newline at end of file
+            MYSQL_ROOT_PASSWORD: ROOT_PASSWORD

+

+    vid-simulator:

+        image: onap/vid-simulator:latest
\ No newline at end of file
diff --git a/vid-ext-services-simulator/Dockerfile b/vid-ext-services-simulator/Dockerfile
new file mode 100644
index 000000000..6cf2d9d0b
--- /dev/null
+++ b/vid-ext-services-simulator/Dockerfile
@@ -0,0 +1,5 @@
+FROM tomcat:jre8-alpine
+
+RUN apk add --no-cache vim net-tools bash
+
+ADD target/vidSimulator.war ./webapps
\ No newline at end of file
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index e8e827bb5..ed6a13c67 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -103,6 +103,20 @@
                 <coberturaBuildPhase>package</coberturaBuildPhase>
             </properties>
         </profile>
+
+        <profile>
+            <id>docker-proxy</id>
+            <!-- activate profile if environment variable `http_proxy` is set -->
+            <activation>
+                <property>
+                    <name>env.http_proxy</name>
+                </property>
+            </activation>
+            <properties>
+                <docker.buildArg.http_proxy>${env.http_proxy}</docker.buildArg.http_proxy>
+            </properties>
+        </profile>
+
     </profiles>
 
     <dependencies>
@@ -146,6 +160,49 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.27.2</version>
+
+                <configuration>
+                    <images>
+                        <image>
+                            <name>onap/vid-simulator</name>
+                            <build>
+                                <cleanup>remove</cleanup>
+                                <dockerFileDir>${project.basedir}</dockerFileDir>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                    <tag>latest</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>generate-image</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>push-image</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+            </plugin>
+
         </plugins>
     </build>