diff options
Diffstat (limited to 'rulemgt-standalone')
| -rw-r--r-- | rulemgt-standalone/linux64-assembly.xml | 7 | ||||
| -rw-r--r-- | rulemgt-standalone/pom.xml | 158 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/Dockerfile | 20 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/run.sh | 4 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/nginx-https.conf | 4 |
5 files changed, 56 insertions, 137 deletions
diff --git a/rulemgt-standalone/linux64-assembly.xml b/rulemgt-standalone/linux64-assembly.xml index 56676c8..3efa765 100644 --- a/rulemgt-standalone/linux64-assembly.xml +++ b/rulemgt-standalone/linux64-assembly.xml @@ -1,6 +1,6 @@ <!-- - Copyright 2017 ZTE Corporation. + Copyright 2017-2020 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,11 @@ <fileSet> <directory>target/assembly/linux64</directory> <outputDirectory></outputDirectory> + <excludes> + <exclude> + lib/holmes-rulemgt-frontend-*.tar.gz + </exclude> + </excludes> </fileSet> </fileSets> </assembly> diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml index 54901dc..95a0c03 100644 --- a/rulemgt-standalone/pom.xml +++ b/rulemgt-standalone/pom.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright 2017 ZTE Corporation. + Copyright 2017-2020 ZTE Corporation. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ 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"> @@ -36,47 +37,50 @@ <build.number>${maven.build.timestamp}</build.number> </properties> + <dependencies> + <dependency> + <groupId>org.onap.holmes.rule-management</groupId> + <artifactId>holmes-rulemgt</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.holmes.rule-management</groupId> + <artifactId>holmes-rulemgt-frontend</artifactId> + <version>${project.version}</version> + <type>tar.gz</type> + </dependency> + </dependencies> + <build> <plugins> <plugin> - <artifactId>maven-resources-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>copy-resources-${linux64id}</id> + <id>copy-dependencies</id> <phase>process-resources</phase> <goals> - <goal>copy-resources</goal> + <goal>copy-dependencies</goal> </goals> - <configuration> - <outputDirectory>${linux64outputdir}</outputDirectory> - <resources> - <resource> - <directory>src/main/assembly/</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.bat</exclude> - <exclude>Dockerfile</exclude> - </excludes> - </resource> - <resource> - <directory>../rulemgt/src/main/resources</directory> - <filtering>false</filtering> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> </execution> + </executions> + <configuration> + <outputDirectory>${linux64outputdir}/lib</outputDirectory> + <includeScope>runtime</includeScope> + </configuration> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> <execution> - <id>copy-resources-${win64id}</id> + <id>copy-resources-${linux64id}</id> <phase>process-resources</phase> <goals> <goal>copy-resources</goal> </goals> <configuration> - <outputDirectory>${win64outputdir}</outputDirectory> + <outputDirectory>${linux64outputdir}</outputDirectory> <resources> <resource> <directory>src/main/assembly/</directory> @@ -85,8 +89,7 @@ <include>**/*</include> </includes> <excludes> - <exclude>**/*.sh</exclude> - <exclude>Dockerfile</exclude> + <exclude>**/*.bat</exclude> </excludes> </resource> <resource> @@ -155,41 +158,6 @@ <artifactItems> <artifactItem> <groupId>org.onap.holmes.rule-management</groupId> - <artifactId>holmes-rulemgt</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${linux64outputdir}</outputDirectory> - <destFileName>holmes-rulemgt.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.onap.holmes.rule-management</groupId> - <artifactId>holmes-rulemgt-frontend</artifactId> - <type>tar.gz</type> - <overWrite>true</overWrite> - <outputDirectory>target/version</outputDirectory> - <destFileName>holmes-rulemgt-frontend-${project.version}.tar.gz</destFileName> - </artifactItem> - </artifactItems> - </configuration> - </execution> - <execution> - <id>copy-artifacts-${win64id}</id> - <goals> - <goal>copy</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.onap.holmes.rule-management</groupId> - <artifactId>holmes-rulemgt</artifactId> - <type>jar</type> - <overWrite>true</overWrite> - <outputDirectory>${win64outputdir}</outputDirectory> - <destFileName>holmes-rulemgt.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>org.onap.holmes.rule-management</groupId> <artifactId>holmes-rulemgt-frontend</artifactId> <type>tar.gz</type> <overWrite>true</overWrite> @@ -219,25 +187,11 @@ <goal>attached</goal> </goals> </execution> - <execution> - <id>win64</id> - <configuration> - <descriptors> - <descriptor>win64-assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> - <outputDirectory>target/version</outputDirectory> - </configuration> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> </executions> </plugin> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> <executions> <execution> <phase>validate</phase> @@ -316,48 +270,4 @@ </build> </profile> </profiles> - - <dependencies> - <dependency> - <groupId>org.onap.holmes.rule-management</groupId> - <artifactId>holmes-rulemgt</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.onap.holmes.rule-management</groupId> - <artifactId>holmes-rulemgt-frontend</artifactId> - <version>${project.version}</version> - <type>tar.gz</type> - </dependency> - </dependencies> </project> diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile index 7d02c68..51a0ec5 100644 --- a/rulemgt-standalone/src/main/assembly/Dockerfile +++ b/rulemgt-standalone/src/main/assembly/Dockerfile @@ -2,13 +2,16 @@ FROM openresty/openresty:alpine MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn> +# 9101 - service port +# 9104 - GUI port +# 9201 - debugging port EXPOSE 9101 9104 9201 ENV HOSTNAME=holmes-rule-mgmt \ LANG=C.UTF-8 \ - JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk \ - PATH=$PATH:/usr/lib/jvm/java-1.8-openjdk/jre/bin:/usr/lib/jvm/java-1.8-openjdk/bin \ - JAVA_ALPINE_VERSION=8.242.08-r0 \ + JAVA_HOME=/usr/lib/jvm/java-11-openjdk \ + PATH=$PATH:/usr/lib/jvm/java-11-openjdk/jre/bin:/usr/lib/jvm/java-11-openjdk/bin \ + JAVA_ALPINE_VERSION=11.0.5_p10-r0 \ PG_VERSION=12.2-r0 #add the backend package to the docker image @@ -19,11 +22,11 @@ ADD holmes-rulemgt-standalone-*-linux64.tar.gz /home/holmes/ ADD holmes-rulemgt-frontend-*.tar.gz /usr/local/openresty/nginx/html/ ADD nginx-https.conf /usr/local/openresty/nginx/conf ADD nginx-http.conf /usr/local/openresty/nginx/conf -ADD holmes-frontend.key /etc/ssl/private -ADD holmes-frontend-selfsigned.crt /etc/ssl/certs -ADD dhparam.pem /etc/ssl/certs +ADD holmes-frontend.key /etc/ssl/private/ +ADD holmes-frontend-selfsigned.crt /etc/ssl/public/ +ADD dhparam.pem /etc/ssl/public/ -#install java-1.8-openjdk +#install java-11-openjdk # add a simple script that can auto-detect the appropriate JAVA_HOME value # based on whether the JDK or only the JRE is installed @@ -37,7 +40,7 @@ RUN { \ && set -x \ && apk upgrade \ && apk update \ - && apk add --no-cache openjdk8="$JAVA_ALPINE_VERSION" \ + && apk add --no-cache openjdk11="$JAVA_ALPINE_VERSION" \ && [ "$JAVA_HOME" = "$(docker-java-home)" ] \ #install neccessary tools && apk add --no-cache curl \ @@ -46,6 +49,7 @@ RUN { \ #add the frontend pacakge to the docker images && rm /etc/nginx/conf.d/default.conf \ && chmod -R 777 /usr/local/openresty/nginx/ \ + && chmod -R 755 /etc/ssl/public \ #switch the user to holmes && addgroup -S holmes && adduser -S -G holmes holmes \ && chmod -R a+rw /home/holmes/ \ diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh index d500e5e..c9c1e65 100644 --- a/rulemgt-standalone/src/main/assembly/bin/run.sh +++ b/rulemgt-standalone/src/main/assembly/bin/run.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright 2017 ZTE Corporation. +# Copyright 2017-2020 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ port=9201 #JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" echo @JAVA_OPTS@ $JAVA_OPTS -class_path="$main_path/:$main_path/holmes-rulemgt.jar" +class_path="$main_path/lib/*" echo @class_path@ $class_path if [ -z ${JDBC_USERNAME} ]; then diff --git a/rulemgt-standalone/src/main/assembly/nginx-https.conf b/rulemgt-standalone/src/main/assembly/nginx-https.conf index e4facf1..fda1ab1 100644 --- a/rulemgt-standalone/src/main/assembly/nginx-https.conf +++ b/rulemgt-standalone/src/main/assembly/nginx-https.conf @@ -57,8 +57,8 @@ http { root html; } - ssl_certificate /etc/ssl/certs/holmes-frontend-selfsigned.crt; + ssl_certificate /etc/ssl/public/holmes-frontend-selfsigned.crt; ssl_certificate_key /etc/ssl/private/holmes-frontend.key; - ssl_dhparam /etc/ssl/certs/dhparam.pem; + ssl_dhparam /etc/ssl/public/dhparam.pem; } } |