diff options
Diffstat (limited to 'nokiav2/deployment')
| -rwxr-xr-x | nokiav2/deployment/Dockerfile | 2 | ||||
| -rwxr-xr-x | nokiav2/deployment/Dockerfile.verify | 20 | ||||
| -rw-r--r-- | nokiav2/deployment/pom.xml | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/nokiav2/deployment/Dockerfile b/nokiav2/deployment/Dockerfile index 68bdb18a..107327d2 100755 --- a/nokiav2/deployment/Dockerfile +++ b/nokiav2/deployment/Dockerfile @@ -12,7 +12,7 @@ RUN yum -y update && \ yum -y install mc vim tcpdump net-tools nc strace telnet unzip && \ yum clean all COPY pom.xml pom.xml -RUN VERSION=`echo -e "setns x=http://maven.apache.org/POM/4.0.0 \n xpath /x:project/x:version/text() "| xmllint --shell pom.xml | grep content | sed 's/.*content=//'| sed 's/-SNAPSHOT//'` ; wget -q -O driver.war "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2&a=driverwar&v=${VERSION}${MODE}&e=war" +RUN VERSION=`echo -e "setns x=http://maven.apache.org/POM/4.0.0 \n xpath /x:project/x:version/text() "| xmllint --shell pom.xml | grep content | sed 's/.*content=//'| sed 's/-SNAPSHOT//'` ; echo "Version $VERSION mode=$MODE"; wget -q -O driver.war "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2&a=driverwar&v=${VERSION}${MODE}&e=war" #Can be used for local builds instead of the previous line #COPY driver.war . ENV JAVA_HOME /usr/lib/jvm/jre diff --git a/nokiav2/deployment/Dockerfile.verify b/nokiav2/deployment/Dockerfile.verify new file mode 100755 index 00000000..107327d2 --- /dev/null +++ b/nokiav2/deployment/Dockerfile.verify @@ -0,0 +1,20 @@ +FROM centos:7 +WORKDIR /service +ARG REPO +ARG MODE +COPY src/main/resources/docker-entrypoint.sh . +COPY src/main/resources/LICENSE ./ONAP_LICENSE +COPY src/main/resources/application.properties . +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf +RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo +RUN yum -y update && \ + yum -y install java-1.8.0-openjdk-headless wget && \ + yum -y install mc vim tcpdump net-tools nc strace telnet unzip && \ + yum clean all +COPY pom.xml pom.xml +RUN VERSION=`echo -e "setns x=http://maven.apache.org/POM/4.0.0 \n xpath /x:project/x:version/text() "| xmllint --shell pom.xml | grep content | sed 's/.*content=//'| sed 's/-SNAPSHOT//'` ; echo "Version $VERSION mode=$MODE"; wget -q -O driver.war "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2&a=driverwar&v=${VERSION}${MODE}&e=war" +#Can be used for local builds instead of the previous line +#COPY driver.war . +ENV JAVA_HOME /usr/lib/jvm/jre +EXPOSE 8089 +ENTRYPOINT /service/docker-entrypoint.sh diff --git a/nokiav2/deployment/pom.xml b/nokiav2/deployment/pom.xml index ff9bc505..94118071 100644 --- a/nokiav2/deployment/pom.xml +++ b/nokiav2/deployment/pom.xml @@ -17,14 +17,14 @@ <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> <artifactId>deployment</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${driver.version}</version> <packaging>pom</packaging> <name>vfc/nfvo/driver/vnfm/svnfm/nokiav2/deployment</name> <description>Nokia SVNFM driver deployment files</description> <parent> <groupId>org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2</groupId> <artifactId>vfc-nfvo-driver-vnfm-svnfm-nokiav2</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <build> <plugins> |