diff options
| author |   danielhanrahan <daniel.hanrahan@est.tech> | 2021-08-30 17:35:18 +0100 |
|---|---|---|
| committer | Daniel Hanrahan <daniel.hanrahan@est.tech> | 2021-09-07 08:22:23 +0000 |
| commit | a8af9621cd5be96dc802710078bae90400f6792a (patch) | |
| tree | 269bf18fec38852cdbbd5e5c0d0c5ff67dd3e356 /packages | |
| parent | a023942e415b1f0a5dfb40a1d8315b66cc951dad (diff) | |
Make gui-pdp-monitoring work in Docker image
Serve PDP Monitoring HTML using nginx in Docker image
Don't serve HTML content from PdpMonitoringServer
Remove unused dependencies in gui-pdp-monitoring
Add proxy setting for local dev testing with npm start
Issue-ID: POLICY-3603
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I9a4c2b250a1f0460892a367a3b5bbb59e0e92411
Diffstat (limited to 'packages')
4 files changed, 21 insertions, 9 deletions
diff --git a/packages/policy-gui-docker/pom.xml b/packages/policy-gui-docker/pom.xml index 94453ce..9574600 100644 --- a/packages/policy-gui-docker/pom.xml +++ b/packages/policy-gui-docker/pom.xml @@ -94,7 +94,13 @@ <includes> <include>org.onap.policy.gui:gui-clamp:tar.gz:clamp-build:${project.version}</include> </includes> - <outputFileNameMapping>gui-clamp.tar.gz</outputFileNameMapping> + <outputFileNameMapping>gui-clamp-html.tar.gz</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>org.onap.policy.gui:gui-pdp-monitoring:tar.gz:frontend:${project.version}</include> + </includes> + <outputFileNameMapping>gui-pdp-monitoring-html.tar.gz</outputFileNameMapping> </dependencySet> <dependencySet> <includes> @@ -172,6 +178,13 @@ <groupId>org.onap.policy.gui</groupId> <artifactId>gui-pdp-monitoring</artifactId> <version>${project.version}</version> + <classifier>frontend</classifier> + <type>tar.gz</type> + </dependency> + <dependency> + <groupId>org.onap.policy.gui</groupId> + <artifactId>gui-pdp-monitoring</artifactId> + <version>${project.version}</version> <type>uber.jar</type> </dependency> <dependency> diff --git a/packages/policy-gui-docker/src/main/docker/Dockerfile b/packages/policy-gui-docker/src/main/docker/Dockerfile index e58c9ea..8820139 100644 --- a/packages/policy-gui-docker/src/main/docker/Dockerfile +++ b/packages/policy-gui-docker/src/main/docker/Dockerfile @@ -40,7 +40,8 @@ COPY /maven/gui-pdp-monitoring-uber.jar ./lib/ COPY nginx/nginx.conf /etc/nginx/nginx.conf COPY nginx/default.conf.template /etc/nginx/templates/default.conf.template COPY nginx/index.html /usr/share/nginx/html/ -ADD /maven/gui-clamp.tar.gz /usr/share/nginx/html/ +ADD /maven/gui-clamp-html.tar.gz /usr/share/nginx/html/ +ADD /maven/gui-pdp-monitoring-html.tar.gz /usr/share/nginx/html/ RUN rm /etc/nginx/conf.d/default.conf && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ diff --git a/packages/policy-gui-docker/src/main/docker/nginx/default.conf.template b/packages/policy-gui-docker/src/main/docker/nginx/default.conf.template index a12f34b..d407827 100644 --- a/packages/policy-gui-docker/src/main/docker/nginx/default.conf.template +++ b/packages/policy-gui-docker/src/main/docker/nginx/default.conf.template @@ -11,14 +11,12 @@ server { proxy_pass ${CLAMP_REST_URL}/restservices/clds/; } - location /apex-editor/ { - proxy_pass http://localhost:18989/; - proxy_set_header Host $host; - proxy_set_header If-Modified-Since $http_if_modified_since; + location /pdp-monitoring/papservices/monitoring/ { + proxy_pass http://localhost:17999/papservices/monitoring/; } - location /pdp-monitoring/ { - proxy_pass http://localhost:18999/; + location /apex-editor/ { + proxy_pass http://localhost:18989/; proxy_set_header Host $host; proxy_set_header If-Modified-Since $http_if_modified_since; } diff --git a/packages/policy-gui-docker/src/main/docker/policy-gui.sh b/packages/policy-gui-docker/src/main/docker/policy-gui.sh index 4d4cbee..bb2d9c9 100644 --- a/packages/policy-gui-docker/src/main/docker/policy-gui.sh +++ b/packages/policy-gui-docker/src/main/docker/policy-gui.sh @@ -27,7 +27,7 @@ echo "Starting gui-editor-apex" $JAVA_HOME/bin/java -jar "$POLICY_HOME/lib/gui-editor-apex-uber.jar" -p 18989 & echo "Starting gui-pdp-monitoring" -$JAVA_HOME/bin/java -jar "$POLICY_HOME/lib/gui-pdp-monitoring-uber.jar" -p 18999 & +$JAVA_HOME/bin/java -jar "$POLICY_HOME/lib/gui-pdp-monitoring-uber.jar" -p 17999 & echo "Starting nginx" envsubst '${CLAMP_REST_URL}' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf |