summaryrefslogtreecommitdiffstats
path: root/engine-d-standalone
diff options
context:
space:
mode:
Diffstat (limited to 'engine-d-standalone')
-rw-r--r--engine-d-standalone/pom.xml152
-rw-r--r--engine-d-standalone/src/main/assembly/Dockerfile56
-rw-r--r--engine-d-standalone/src/main/assembly/bin/run.sh16
-rw-r--r--engine-d-standalone/src/main/assembly/conf/engine-d.yml2
4 files changed, 52 insertions, 174 deletions
diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index e13f013..2b74693 100644
--- a/engine-d-standalone/pom.xml
+++ b/engine-d-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.
@@ -36,46 +36,44 @@
<build.number>${maven.build.timestamp}</build.number>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.holmes.engine-management</groupId>
+ <artifactId>holmes-engine-d</artifactId>
+ <version>${project.version}</version>
+ </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>
- </excludes>
- </resource>
- <resource>
- <directory>../engine-d/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>
@@ -84,7 +82,7 @@
<include>**/*</include>
</includes>
<excludes>
- <exclude>**/*.sh</exclude>
+ <exclude>**/*.bat</exclude>
</excludes>
</resource>
<resource>
@@ -119,50 +117,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-jar-${linux64id}</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.onap.holmes.engine-management</groupId>
- <artifactId>holmes-engine-d</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${linux64outputdir}</outputDirectory>
- <destFileName>holmes-engine-d.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-jar-${win64id}</id>
- <goals>
- <goal>copy</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.onap.holmes.engine-management</groupId>
- <artifactId>holmes-engine-d</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${win64outputdir}</outputDirectory>
- <destFileName>holmes-engine-d.jar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -179,25 +133,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>
@@ -276,42 +216,4 @@
</build>
</profile>
</profiles>
-
- <dependencies>
- <dependency>
- <groupId>org.onap.holmes.engine-management</groupId>
- <artifactId>holmes-engine-d</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>
- </dependencies>
</project>
diff --git a/engine-d-standalone/src/main/assembly/Dockerfile b/engine-d-standalone/src/main/assembly/Dockerfile
index 6ea28d8..a1f427a 100644
--- a/engine-d-standalone/src/main/assembly/Dockerfile
+++ b/engine-d-standalone/src/main/assembly/Dockerfile
@@ -1,49 +1,25 @@
-FROM openresty/openresty:alpine
+FROM onap/integration-java11:7.0.0
MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn>
+USER root
+
+# 9102 - service port
+# 9202 - debugging port
EXPOSE 9102 9202
ENV HOSTNAME=holmes-engine-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 \
- PG_VERSION=12.2-r0
-
-#add the backend package to the docker image
-WORKDIR /home/holmes
-ADD holmes-engine-d-standalone-*-linux64.tar.gz /home/holmes/
-
-# add a simple script that can auto-detect the appropriate JAVA_HOME value
-# based on whether the JDK or only the JRE is installed
-RUN { \
- echo '#!/bin/sh'; \
- echo 'set -e'; \
- echo; \
- echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \
- } > /usr/local/bin/docker-java-home \
- && chmod +x /usr/local/bin/docker-java-home \
- && set -x \
- #install java-1.8-openjdk
- && apk add --no-cache openjdk8="$JAVA_ALPINE_VERSION" \
- && [ "$JAVA_HOME" = "$(docker-java-home)" ] \
- #install neccessary tools
- && apk upgrade \
- && apk update \
- && apk add --no-cache curl \
- && apk add --no-cache wget \
- && apk add --no-cache postgresql-client="$PG_VERSION" \
- && apk add --no-cache nss \
-
- #switch the user to holmes
- && addgroup -S holmes && adduser -S -G holmes holmes \
-
- && chmod -R a+rw /home/holmes/ \
- && chmod -R a+rw /var/log/ \
- && chmod 755 /home/holmes/bin/*.sh
+ LANG=C.UTF-8
-USER holmes
+ADD holmes-engine-d-standalone-*-linux64.tar.gz /opt/onap/
+
+RUN apt-get upgrade \
+ && apt-get update \
+ && apt-get install -y curl postgresql-client-11 \
+ && chmod -R a+rw /opt/onap/ \
+ && chmod -R a+rw /var/log/ \
+ && chmod 755 /opt/onap/bin/*.sh
-CMD ["sh", "/home/holmes/bin/run.sh"]
+USER onap
+ENTRYPOINT ["sh", "/opt/onap/bin/run.sh"]
diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh
index 77a96cc..7c800b5 100644
--- a/engine-d-standalone/src/main/assembly/bin/run.sh
+++ b/engine-d-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.
@@ -25,12 +25,12 @@ JAVA="$JAVA_HOME/bin/java"
echo @JAVA@ $JAVA
main_path=$RUNHOME/..
cd $main_path
-JAVA_OPTS="-Xms128m -Xmx512m"
+JAVA_OPTS="-Xms256m -Xmx1g"
port=8312
-#JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n"
+#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-engine-d.jar"
+class_path="$main_path/lib/*"
echo @class_path@ $class_path
if [ -z ${JDBC_USERNAME} ]; then
@@ -55,7 +55,7 @@ sed -i "s|password:.*|password: $JDBC_PASSWORD|" "$main_path/conf/engine-d.yml"
export SERVICE_IP=`hostname -i`
echo SERVICE_IP=${SERVICE_IP}
-if [ ! -z ${TESTING} ] && [ ${TESTING} == 1 ]; then
+if [ ! -z ${TESTING} -a ${TESTING} = 1 ]; then
if [ ! -z ${HOST_IP} ]; then
export HOSTNAME=${HOST_IP}:9102
else
@@ -64,7 +64,7 @@ if [ ! -z ${TESTING} ] && [ ${TESTING} == 1 ]; then
fi
export DB_PORT=5432
-if [ ! -z ${URL_JDBC} ] && [ `expr index $URL_JDBC :` != 0 ]; then
+if [ ! -z ${URL_JDBC} -a `expr index $URL_JDBC :` != 0 ]; then
export DB_PORT="${URL_JDBC##*:}"
fi
echo DB_PORT=$DB_PORT
@@ -74,13 +74,13 @@ if [ -z ${ENABLE_ENCRYPT} ]; then
fi
echo ENABLE_ENCRYPT=$ENABLE_ENCRYPT
-KEY_PATH="/home/holmes/conf/holmes.keystore"
+KEY_PATH="/opt/onap/conf/holmes.keystore"
KEY_PASSWORD="holmes"
#HTTPS Configurations
sed -i "s|keyStorePath:.*|keyStorePath: $KEY_PATH|" "$main_path/conf/engine-d.yml"
sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf/engine-d.yml"
-if [ ${ENABLE_ENCRYPT} == true ]; then
+if [ ${ENABLE_ENCRYPT} = true ]; then
sed -i "s|type:\s*https\?$|type: https|" "$main_path/conf/engine-d.yml"
sed -i "s|#\?keyStorePath|keyStorePath|" "$main_path/conf/engine-d.yml"
sed -i "s|#\?keyStorePassword|keyStorePassword|" "$main_path/conf/engine-d.yml"
diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
index ca4f243..103fe47 100644
--- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml
+++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml
@@ -21,7 +21,7 @@ server:
connector:
type: https
port: 9102
- keyStorePath: /home/holmes/conf/holmes.keystore
+ keyStorePath: /opt/onap/conf/holmes.keystore
keyStorePassword: holmes
validateCerts: false
validatePeers: false