From 69d300a2132f103162a5e98f68ae4256750ce527 Mon Sep 17 00:00:00 2001 From: danielhanrahan Date: Wed, 8 Sep 2021 17:55:13 +0100 Subject: Remove CLAMP_REST_URL variable from Docker image Remove redundant CLAMP_REST_URL environment variable Update README to remove references to CLAMP_REST_URL Group Dockerfile COPY commands to reduce image layers Issue-ID: POLICY-3639 Signed-off-by: danielhanrahan Change-Id: Ia6947a6681875167dfc63b0ffd19f7dc6faad6d4 --- .../src/main/docker/nginx/default.conf.template | 33 ---------------------- .../src/main/docker/nginx/index.html | 14 --------- .../src/main/docker/nginx/nginx.conf | 18 ------------ 3 files changed, 65 deletions(-) delete mode 100644 packages/policy-gui-docker/src/main/docker/nginx/default.conf.template delete mode 100644 packages/policy-gui-docker/src/main/docker/nginx/index.html delete mode 100644 packages/policy-gui-docker/src/main/docker/nginx/nginx.conf (limited to 'packages/policy-gui-docker/src/main/docker/nginx') 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 deleted file mode 100644 index 9b3348a..0000000 --- a/packages/policy-gui-docker/src/main/docker/nginx/default.conf.template +++ /dev/null @@ -1,33 +0,0 @@ -server { - listen 2443 default ssl; - ssl_protocols TLSv1.2; - ssl_certificate /etc/ssl/clamp.pem; - ssl_certificate_key /etc/ssl/clamp.key; - ssl_verify_client optional_no_ca; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ =404; - } - - location /clamp/restservices/clds/ { - proxy_pass ${CLAMP_REST_URL}/restservices/clds/; - 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; - } - error_page 500 502 503 504 /50x.html; -} diff --git a/packages/policy-gui-docker/src/main/docker/nginx/index.html b/packages/policy-gui-docker/src/main/docker/nginx/index.html deleted file mode 100644 index 98742ae..0000000 --- a/packages/policy-gui-docker/src/main/docker/nginx/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - ONAP Policy GUI - - - - - diff --git a/packages/policy-gui-docker/src/main/docker/nginx/nginx.conf b/packages/policy-gui-docker/src/main/docker/nginx/nginx.conf deleted file mode 100644 index aac9bb6..0000000 --- a/packages/policy-gui-docker/src/main/docker/nginx/nginx.conf +++ /dev/null @@ -1,18 +0,0 @@ -worker_processes 1; -pid /var/run/nginx.pid; -error_log /dev/stdout info; -events { -} -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - #tcp_nopush on; - keepalive_timeout 65; - #gzip on; - include /etc/nginx/conf.d/*.conf; -} -- cgit 1.2.3-korg