diff options
Diffstat (limited to 'rulemgt-standalone')
| -rw-r--r-- | rulemgt-standalone/pom.xml | 3 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/Dockerfile | 17 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/initDB.sh | 4 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/run.sh | 5 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/bin/stop.sh | 4 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/nginx-http.conf | 2 | ||||
| -rw-r--r-- | rulemgt-standalone/src/main/assembly/nginx-https.conf | 2 |
7 files changed, 18 insertions, 19 deletions
diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml index e80c175..bcabe2f 100644 --- a/rulemgt-standalone/pom.xml +++ b/rulemgt-standalone/pom.xml @@ -176,6 +176,7 @@ <execution> <id>linux64</id> <configuration> + <tarLongFileMode>gnu</tarLongFileMode> <descriptors> <descriptor>linux64-assembly.xml</descriptor> </descriptors> @@ -184,7 +185,7 @@ </configuration> <phase>package</phase> <goals> - <goal>attached</goal> + <goal>single</goal> </goals> </execution> </executions> diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile index 198d0ef..b03daa0 100644 --- a/rulemgt-standalone/src/main/assembly/Dockerfile +++ b/rulemgt-standalone/src/main/assembly/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/integration-java11:7.0.0 +FROM onap/integration-java17:12.0.0 MAINTAINER "Guangrong Fu" <fu.guangrong@zte.com.cn> @@ -10,24 +10,23 @@ USER root EXPOSE 9101 9104 9201 ENV HOSTNAME=holmes-rule-mgmt \ - LANG=C.UTF-8 + LANG=C.UTF-8 \ + PG_VERSION=12.2-r0 -RUN apt-get upgrade \ - && apt-get update \ - && apt-get install -y curl postgresql-client-11 nginx +RUN apk update \ + && apk add --no-cache curl postgresql-client nginx \ + && mkdir -p /opt/onap ADD holmes-rulemgt-standalone-*-linux64.tar.gz /opt/onap/ -ADD holmes-rulemgt-frontend-*.tar.gz /usr/share/nginx/html/ +ADD holmes-rulemgt-frontend-*.tar.gz /var/lib/nginx/html/ ADD nginx-https.conf /etc/nginx/conf.d/ ADD nginx-http.conf /etc/nginx/conf.d/ ADD holmes-frontend.key /etc/ssl/private/ ADD holmes-frontend-selfsigned.crt /etc/ssl/certs/ ADD dhparam.pem /etc/ssl/certs/ -RUN mkdir -p /usr/share/nginx/logs \ - && chmod -R 777 /usr/share/nginx/ \ - && chmod -R 777 /var/lib/nginx/ \ +RUN chmod -R 777 /var/lib/nginx/ \ && chmod -R 755 /etc/ssl/private/ \ && chmod -R 755 /etc/ssl/certs/ \ && chmod -R 777 /etc/nginx/conf.d/ \ diff --git a/rulemgt-standalone/src/main/assembly/bin/initDB.sh b/rulemgt-standalone/src/main/assembly/bin/initDB.sh index c43f3e9..cb9dde9 100644 --- a/rulemgt-standalone/src/main/assembly/bin/initDB.sh +++ b/rulemgt-standalone/src/main/assembly/bin/initDB.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # -# Copyright 2017-2021 ZTE Corporation. +# Copyright 2017-2023 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh index 03e00a6..18a3c9a 100644 --- a/rulemgt-standalone/src/main/assembly/bin/run.sh +++ b/rulemgt-standalone/src/main/assembly/bin/run.sh @@ -1,7 +1,6 @@ -#!/usr/bin/env bash - +#!/usr/bin/env sh # -# Copyright 2017-2022 ZTE Corporation. +# Copyright 2017-2023 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rulemgt-standalone/src/main/assembly/bin/stop.sh b/rulemgt-standalone/src/main/assembly/bin/stop.sh index ade940d..106ef23 100644 --- a/rulemgt-standalone/src/main/assembly/bin/stop.sh +++ b/rulemgt-standalone/src/main/assembly/bin/stop.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # -# Copyright 2017-2021 ZTE Corporation. +# Copyright 2017-2023 ZTE Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/rulemgt-standalone/src/main/assembly/nginx-http.conf b/rulemgt-standalone/src/main/assembly/nginx-http.conf index 6c49c87..0b0224d 100644 --- a/rulemgt-standalone/src/main/assembly/nginx-http.conf +++ b/rulemgt-standalone/src/main/assembly/nginx-http.conf @@ -32,7 +32,7 @@ http { server_name _; location / { - root /usr/share/nginx/html; + root /var/lib/nginx/html; proxy_set_header Host $proxy_host; proxy_set_header X-Real-IP $remote_addr; diff --git a/rulemgt-standalone/src/main/assembly/nginx-https.conf b/rulemgt-standalone/src/main/assembly/nginx-https.conf index dafb571..2a9e493 100644 --- a/rulemgt-standalone/src/main/assembly/nginx-https.conf +++ b/rulemgt-standalone/src/main/assembly/nginx-https.conf @@ -36,7 +36,7 @@ http { server_name _; location / { - root /usr/share/nginx/html; + root /var/lib/nginx/html; proxy_set_header Host $proxy_host; proxy_set_header X-Real-IP $remote_addr; |