docker file update

Change-Id: I6a7356e740263fe818572bf5cb71618d2c259d01
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/pom.xml b/pom.xml
index 1694085..51e2a6e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
                <module>openecomp-ui</module>
 
                <module>sdc-os-chef</module>
+
        </modules>
 
 

diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index ec10e4f..ae99743 100644 (file)
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -1,5 +1,5 @@
 <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">
+                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>
 
@@ -11,36 +11,199 @@
                <version>1.0.0-SNAPSHOT</version>
        </parent>
 
+
        <build>
-           <plugins>
-               <plugin>
-                       <groupId>com.google.code.maven-replacer-plugin</groupId>
-                        <artifactId>replacer</artifactId>
-                        <version>1.5.3</version>
-                        <executions>
-                               <execution>
-                                       <phase>package</phase>
-                                        <goals>
-                                               <goal>replace</goal>
-                                        </goals>
-                                </execution>
-                        </executions>
-
-                        <configuration>
-                               <basedir>${project.basedir}</basedir>
-                               <includes>
-                                       <include>sdc-backend/Dockerfile</include>
-                                                               <include>sdc-frontend/Dockerfile</include>
-                                                               <include>scripts/docker_run.sh</include>                                                        
-                               </includes>
-                               <replacements>
-                                       <replacement>
-                                               <token>__SDC-RELEASE__</token>
-                                               <value>${project.version}</value>
-                                       </replacement>
-                               </replacements>
-                        </configuration>
-               </plugin>
-           </plugins>
+               <plugins>
+                       <plugin>
+                               <groupId>com.google.code.maven-replacer-plugin</groupId>
+                               <artifactId>replacer</artifactId>
+                               <version>1.5.3</version>
+                               <executions>
+                                       <execution>
+                                               <phase>prepare-package</phase>
+                                               <goals>
+                                                       <goal>replace</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+
+                               <configuration>
+                                       <basedir>${project.basedir}</basedir>
+                                       <includes>
+                                               <include>sdc-backend/Dockerfile</include>
+                                               <include>sdc-frontend/Dockerfile</include>
+                                               <include>scripts/docker_run.sh</include>
+                                       </includes>
+                                       <replacements>
+                                               <replacement>
+                                                       <token>__SDC-RELEASE__</token>
+                                                       <value>${project.version}</value>
+                                               </replacement>
+                                       </replacements>
+                               </configuration>
+                       </plugin>
+               </plugins>
        </build>
+
+       <profiles>
+               <profile>
+                       <id>docker</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <artifactId>maven-resources-plugin</artifactId>
+                                               <version>3.0.2</version>
+                                               <executions>
+                                                       <execution>
+                                                               <id>copy-resources-be</id>
+                                                               <!-- here the phase you need -->
+                                                               <phase>validate</phase>
+                                                               <goals>
+                                                                       <goal>copy-resources</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <outputDirectory>${basedir}/sdc-backend</outputDirectory>
+                                                                       <resources>
+                                                                               <resource>
+                                                                                       <directory>${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target</directory>
+                                                                                       <includes>
+                                                                                               <include>onboarding-be-*.war</include>
+                                                                                       </includes>
+                                                                               </resource>
+                                                                       </resources>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               <id>copy-resources-fe</id>
+                                                               <!-- here the phase you need -->
+                                                               <phase>validate</phase>
+                                                               <goals>
+                                                                       <goal>copy-resources</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <outputDirectory>${basedir}/sdc-frontend</outputDirectory>
+                                                                       <resources>
+                                                                               <resource>
+                                                                                       <directory>${project.parent.basedir}/openecomp-ui/dist</directory>
+                                                                                       <includes>
+                                                                                               <include>onboarding*.war</include>
+                                                                                       </includes>
+                                                                               </resource>
+                                                                       </resources>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+
+
+
+                                       <plugin>
+                                               <groupId>io.fabric8</groupId>
+                                               <artifactId>docker-maven-plugin</artifactId>
+                                               <version>0.16.5</version>
+
+                                               <configuration>
+                                                       <verbose>true</verbose>
+                                                       <apiVersion>1.23</apiVersion>
+
+                                                       <images>
+
+                                                               <!-- Build backend image -->
+                                                               <image>
+                                                                       <name>openecomp/sdc-backend:%l</name>
+                                                                       <alias>sdc-backend</alias>
+                                                                       <build>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>sdc-backend</dockerFileDir>
+                                                                               <dockerFile>../../../sdc-backend/Dockerfile</dockerFile>
+                                                                       </build>
+                                                               </image>
+
+                                                               <!-- Build frontend image -->
+                                                               <image>
+                                                                       <name>openecomp/sdc-frontend:%l</name>
+                                                                       <alias>sdc-frontend</alias>
+                                                                       <build>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>sdc-frontend</dockerFileDir>
+                                                                               <dockerFile>../../../sdc-frontend/Dockerfile</dockerFile>
+                                                                       </build>
+                                                               </image>
+
+                                                               <!-- Build elastic search image -->
+                                                               <image>
+                                                                       <name>openecomp/sdc-elasticsearch:%l</name>
+                                                                       <alias>sdc-elasticsearch</alias>
+                                                                       <build>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>sdc-elasticsearch</dockerFileDir>
+                                                                               <dockerFile>../../../sdc-elasticsearch/Dockerfile</dockerFile>
+                                                                       </build>
+                                                               </image>
+
+                                                               <!-- Build kibana image -->
+                                                               <image>
+                                                                       <name>openecomp/sdc-kibana:%l</name>
+                                                                       <alias>sdc-kibana</alias>
+                                                                       <build>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>sdc-kibana</dockerFileDir>
+                                                                               <dockerFile>../../../sdc-kibana/Dockerfile</dockerFile>
+                                                                       </build>
+                                                               </image>
+
+                                                               <!-- Build cassandra image
+                                                               <image>
+                                                                       <name>openecomp/sdc-cassandra:%l</name>
+                                                                       <alias>sdc-cassandra</alias>
+                                                                       <build>
+                                                                               <cleanup>try</cleanup>
+                                                                               <dockerFileDir>sdc-cassandra</dockerFileDir>
+                                                                               <dockerFile>../../../sdc-cassandra/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>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+                                </configuration>
+                                                       </execution>
+
+                                                       <execution>
+                                                               <id>generate-images</id>
+                                                               <phase>package</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>openecomp/sdc-backend:%l,openecomp/sdc-frontend:%l,openecomp/sdc-elasticsearch:%l,openecomp/sdc-kibana:%l</image>
+                                </configuration>
+                                                       </execution>
+                                               </executions>
+
+                                       </plugin>
+
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
 </project>

diff --git a/sdc-os-chef/sdc-backend/Dockerfile b/sdc-os-chef/sdc-backend/Dockerfile
new file mode 100644 (file)
index 0000000..72c8558
--- /dev/null
+++ b/sdc-os-chef/sdc-backend/Dockerfile
@@ -0,0 +1,27 @@
+FROM jetty:9.3.15-jre8
+
+RUN apt-get -y update
+RUN apt-get -y install apt-utils
+RUN apt-get -y install curl
+RUN apt-get -y install vim
+RUN apt-get -y install jq
+RUN apt-get -y install python libssl-dev libcurl4-openssl-dev python-dev gcc
+
+COPY chef-solo /root/chef-solo/
+COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/
+
+RUN python /root/chef-solo/cookbooks/sdc-normatives/files/default/get-pip.py
+RUN pip install pycurl
+
+# install chef-solo
+RUN curl -L https://www.opscode.com/chef/install.sh | bash
+
+ADD onboarding-be-__SDC-RELEASE__.war          ${JETTY_BASE}/webapps/
+ADD catalog-be-__SDC-RELEASE__.war             ${JETTY_BASE}/webapps/
+RUN chown -R jetty:jetty                       ${JETTY_BASE}/webapps
+
+COPY startup.sh /root/
+
+RUN chmod 770 /root/startup.sh
+
+ENTRYPOINT [ "/root/startup.sh" ]

diff --git a/sdc-os-chef/sdc-frontend/Dockerfile b/sdc-os-chef/sdc-frontend/Dockerfile
new file mode 100644 (file)
index 0000000..9e55749
--- /dev/null
+++ b/sdc-os-chef/sdc-frontend/Dockerfile
@@ -0,0 +1,24 @@
+FROM jetty:9.3.15-jre8
+
+RUN apt-get -y update
+RUN apt-get -y install apt-utils
+RUN apt-get -y install curl
+RUN apt-get -y install vim
+
+COPY chef-solo /root/chef-solo/
+COPY chef-repo/cookbooks /root/chef-solo/cookbooks/
+
+# install chef-solo
+RUN curl -L https://www.opscode.com/chef/install.sh | bash
+
+RUN cp ${JETTY_HOME}/resources/log4j.properties ${JETTY_BASE}/resources/log4j.properties
+
+ADD onboarding*.war                    ${JETTY_BASE}/webapps/
+ADD catalog-fe-__SDC-RELEASE__.war     ${JETTY_BASE}/webapps/
+RUN chown -R jetty:jetty               ${JETTY_BASE}/webapps
+
+COPY startup.sh /root/
+
+RUN chmod 770 /root/startup.sh
+
+ENTRYPOINT [ "/root/startup.sh" ]