Improve Docker deployment

JIRA: DOVETAIL-755

This patch improves Docker deployment. It removes the extra unwanted
container. In addition, it removes unused files. Finally, it fixes the
issue of python install where the static files of swagger where not
installed inside the api container.

Change-Id: Id74c88ab77182ed233f0eedad39ff8da245bb3dd
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>

1 files changed, 96 insertions, 164 deletions

diff --git a/docker/nginx/sites-available/default b/docker/nginx/sites-available/default
index 765e33e..7652eb1 100644
--- a/docker/nginx/sites-available/default
+++ b/docker/nginx/sites-available/default
@@ -1,168 +1,100 @@
-# You may add here your
-# server {
-#	...
-# }
-# statements for each of your virtual hosts to this file
-
-##
-# You should look at the following URL's in order to grasp a solid understanding
-# of Nginx configuration files in order to fully unleash the power of Nginx.
-# http://wiki.nginx.org/Pitfalls
-# http://wiki.nginx.org/QuickStart
-# http://wiki.nginx.org/Configuration
-#
-# Generally, you will want to move this file somewhere, and start with a clean
-# file but keep this around for reference. Or just disable in sites-enabled.
-#
-# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
-##
-
-upstream testapi {
-    server 192.168.33.101:8010; 
-}
-
-upstream testapi_cvp {
-    server 192.168.33.101:8011;
+upstream cvpapi {
+    server cvpapi:8010;
 }
 
 server {
-	listen 8000 default_server;
-	listen [::]:8000 default_server ipv6only=on;
-
-	root /usr/share/nginx/html;
-	index index.html index.htm;
-
-	# Make site accessible from http://localhost/
-	server_name localhost;
-
-        #location ~* /testapi-ui/.+/\.(js|css|html|json|map|jpg|jpeg|gif|png|swf)$ {
-        location ~* /testapi-ui/ {
-            #if (-f $request_filename) {
-                root /www/static; 
-                expires 1d;
-                #break;
-            #}
-        }
-
-        location ~* /logs/.*\.(log|out|yaml|yml|txt|conf|json|sh|)$ {
-            root /home/testapi;
-            add_header Content-Type text/plain;
-        }
-
-        location ~* /logs/.*/results {
-            root /home/testapi;
-            expires 1d;
-            autoindex on;
-            autoindex_exact_size off;
-            autoindex_localtime on;
-        }
-
-        location /api/v1/auth {
-            proxy_pass http://testapi_cvp/api/v1/auth;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-        }
-
-        location /api/v1/profile {
-            proxy_pass http://testapi_cvp/api/v1/profile;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-        }
-
-        location /api/v1/test {
-            proxy_pass http://testapi_cvp/api/v1/test;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-        }
-
-        location /api/v1/ {
-            proxy_pass http://testapi/api/v1/;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header Host $host;
-        }
-
-	location / {
-		# First attempt to serve request as file, then
-		# as directory, then fall back to displaying a 404.
-		#try_files $uri $uri/ =404;
-		# Uncomment to enable naxsi on this location
-		# include /etc/nginx/naxsi.rules
-                root /www/static/testapi-ui;
-                expires 1d;
-	}
-
-	# Only for nginx-naxsi used with nginx-naxsi-ui : process denied requests
-	#location /RequestDenied {
-	#	proxy_pass http://127.0.0.1:8080;    
-	#}
-
-	#error_page 404 /404.html;
-
-	# redirect server error pages to the static page /50x.html
-	#
-	#error_page 500 502 503 504 /50x.html;
-	#location = /50x.html {
-	#	root /usr/share/nginx/html;
-	#}
-
-	# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-	#
-	#location ~ \.php$ {
-	#	fastcgi_split_path_info ^(.+\.php)(/.+)$;
-	#	# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
-	#
-	#	# With php5-cgi alone:
-	#	fastcgi_pass 127.0.0.1:9000;
-	#	# With php5-fpm:
-	#	fastcgi_pass unix:/var/run/php5-fpm.sock;
-	#	fastcgi_index index.php;
-	#	include fastcgi_params;
-	#}
-
-	# deny access to .htaccess files, if Apache's document root
-	# concurs with nginx's one
-	#
-	#location ~ /\.ht {
-	#	deny all;
-	#}
-}
+    listen 8000 default_server;
+    listen [::]:8000 default_server ipv6only=on;
+
+    root /usr/share/nginx/html;
+    index index.html index.htm;
+
+    server_name localhost;
+
+    location ~* /testapi-ui/ {
+        root /www/static;
+        expires 1d;
+    }
+
+    location ~* /logs/.*\.(log|out|yaml|yml|txt|conf|json|sh|)$ {
+        root /home/testapi;
+        add_header Content-Type text/plain;
+    }
+
+    location ~* /logs/.*/results {
+        root /home/testapi;
+        expires 1d;
+        autoindex on;
+        autoindex_exact_size off;
+        autoindex_localtime on;
+    }
+
+    location ~* /logs/api {
+        root /home/testapi;
+        expires 1d;
+        autoindex on;
+        autoindex_exact_size on;
+        autoindex_localtime on;
+    }
+
+    location /api/v1/cvp {
+        proxy_pass http://cvpapi/api/v1/cvp;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location /api/v1/auth {
+        proxy_pass http://cvpapi/api/v1/auth;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location /api/v1/profile {
+        proxy_pass http://cvpapi/api/v1/profile;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location /api/v1/test {
+        proxy_pass http://cvpapi/api/v1/test;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location = /api/v1/results {
+        proxy_pass http://cvpapi/api/v1/results;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location ~* /api/v1/results/([a-zA-Z0-9]+) {
+        client_max_body_size 20m;
+        proxy_pass http://cvpapi/api/v1/results/$1;
+        proxy_set_header X-Real_IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location ~* /api/v1/suts/hardware/([a-zA-Z0-9\-]+) {
+        proxy_pass http://cvpapi/api/v1/suts/hardware/$1;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location /api/v1/ {
+        proxy_pass http://cvpapi/api/v1/;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header Host $host;
+    }
+
+    location / {
+        root /www/static/testapi-ui;
+        expires 1d;
+    }
+
+    error_page 413 =200 /413.json;
+
+    location /413.json {
+        return 200 '{"msg": "Please upload a file less than 20MB.", "code": 413}';
+    }
 
-
-# another virtual host using mix of IP-, name-, and port-based configuration
-#
-#server {
-#	listen 8000;
-#	listen somename:8080;
-#	server_name somename alias another.alias;
-#	root html;
-#	index index.html index.htm;
-#
-#	location / {
-#		try_files $uri $uri/ =404;
-#	}
-#}
-
-
-# HTTPS server
-#
-#server {
-#	listen 443;
-#	server_name localhost;
-#
-#	root html;
-#	index index.html index.htm;
-#
-#	ssl on;
-#	ssl_certificate cert.pem;
-#	ssl_certificate_key cert.key;
-#
-#	ssl_session_timeout 5m;
-#
-#	ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-#	ssl_ciphers "HIGH:!aNULL:!MD5 or HIGH:!aNULL:!MD5:!3DES";
-#	ssl_prefer_server_ciphers on;
-#
-#	location / {
-#		try_files $uri $uri/ =404;
-#	}
-#}
+}