From 9fd5ad2dc79c416f5e277f5b233f90ace5191cd8 Mon Sep 17 00:00:00 2001 From: danielhanrahan Date: Fri, 17 Sep 2021 18:58:20 +0100 Subject: Disable apex-editor and pdp-monitoring Have only nginx process (clamp) running in policy-gui Issue-ID: POLICY-3650 Signed-off-by: danielhanrahan Change-Id: If15d54f83444b845dc23b090cf966afaf1664490 --- packages/policy-gui-docker/src/main/docker/Dockerfile | 3 +-- .../src/main/docker/etc/nginx/http.d/default.conf | 10 ---------- packages/policy-gui-docker/src/main/docker/index.html | 2 -- packages/policy-gui-docker/src/main/docker/policy-gui.sh | 15 +-------------- 4 files changed, 2 insertions(+), 28 deletions(-) (limited to 'packages/policy-gui-docker/src') diff --git a/packages/policy-gui-docker/src/main/docker/Dockerfile b/packages/policy-gui-docker/src/main/docker/Dockerfile index 0e8bcc2..b7ba494 100644 --- a/packages/policy-gui-docker/src/main/docker/Dockerfile +++ b/packages/policy-gui-docker/src/main/docker/Dockerfile @@ -34,8 +34,7 @@ RUN mkdir -p $POLICY_HOME $POLICY_LOGS $POLICY_HOME/bin $POLICY_HOME/lib && \ COPY --chown=policy:policy etc/ /etc/ COPY --chown=policy:policy policy-gui.sh $POLICY_HOME/bin/ -COPY --chown=policy:policy /maven/*.jar $POLICY_HOME/lib/ -ADD --chown=policy:policy index.html /maven/*-html.tar.gz /usr/share/nginx/html/ +ADD --chown=policy:policy index.html /maven/gui-clamp-html.tar.gz /usr/share/nginx/html/ RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ touch /var/run/nginx.pid && \ diff --git a/packages/policy-gui-docker/src/main/docker/etc/nginx/http.d/default.conf b/packages/policy-gui-docker/src/main/docker/etc/nginx/http.d/default.conf index 2c589c4..c03894d 100644 --- a/packages/policy-gui-docker/src/main/docker/etc/nginx/http.d/default.conf +++ b/packages/policy-gui-docker/src/main/docker/etc/nginx/http.d/default.conf @@ -16,16 +16,6 @@ server { proxy_set_header X-SSL-Cert $ssl_client_escaped_cert; } - location /pdp-monitoring/papservices/monitoring/ { - proxy_pass http://localhost:17999/papservices/monitoring/; - } - - location /apex-editor/ { - proxy_pass http://localhost:18989/; - proxy_set_header Host $host; - proxy_set_header If-Modified-Since $http_if_modified_since; - } - location = /50x.html { root /var/lib/nginx/html; } diff --git a/packages/policy-gui-docker/src/main/docker/index.html b/packages/policy-gui-docker/src/main/docker/index.html index 98742ae..54b07f1 100644 --- a/packages/policy-gui-docker/src/main/docker/index.html +++ b/packages/policy-gui-docker/src/main/docker/index.html @@ -6,8 +6,6 @@

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 050cbb7..7cdefba 100644 --- a/packages/policy-gui-docker/src/main/docker/policy-gui.sh +++ b/packages/policy-gui-docker/src/main/docker/policy-gui.sh @@ -19,17 +19,4 @@ # ============LICENSE_END========================================================= # -trap 'exit 0' SIGTERM - -JAVA_HOME=/usr/lib/jvm/java-11-openjdk/ - -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 17999 & - -echo "Starting nginx" -nginx -g "daemon on;" - -wait +nginx -g "daemon off;" -- cgit 1.2.3-korg