Merge "Bug fix nginx resover address."

7 files changed, 20 insertions, 10 deletions

diff --git a/components/datalake-handler/admin/Dockerfile b/components/datalake-handler/admin/Dockerfile
index 95af88a5..38c50a65 100644
--- a/components/datalake-handler/admin/Dockerfile
+++ b/components/datalake-handler/admin/Dockerfile
@@ -11,13 +11,21 @@ RUN npm install && \
     npm run build
 
 
-FROM nginx:1.15.12
+FROM nginx:1.17.9
 RUN apt-get update && \
-    apt-get install -y dnsmasq
+    apt-get install -y dnsmasq 
 
 RUN echo "\n\n# Docker extra config \nuser=root\naddn-hosts=/etc/hosts\n" >> /etc/dnsmasq.conf
 
 COPY --from=builder /app/dist/* /usr/share/nginx/html/
 COPY --from=builder /app/dl-admin-nginx.conf /etc/nginx/conf.d/default.conf
 
-CMD service dnsmasq restart && nginx -g "daemon off;"
+CMD echo "domain-needed" >> /etc/dnsmasq.conf && \
+      echo "resolv-file=/etc/resolv.conf" >> /etc/dnsmasq.conf && \
+      echo "expand-hosts" >> /etc/dnsmasq.conf && \
+      echo "listen-address=127.0.0.1" >> /etc/dnsmasq.conf && \     
+      service dnsmasq restart && \
+      echo set \$upstreamName http://dl-feeder.`grep search /etc/resolv.conf | awk {'print $2'}`:1680/datalake/v1\$1\$is_args\$args\; > /etc/nginx/upstream.conf && \
+      nginx -g "daemon off;"
+
+#CMD ["sh", "-c", "tail -f /dev/null"]
diff --git a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
index 9551a1db..b6caa609 100644
--- a/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
+++ b/components/datalake-handler/admin/nginx/dl-admin-nginx.conf
@@ -2,9 +2,10 @@ server {
     listen 80;
     root  /usr/share/nginx/html;
 
+    resolver 127.0.0.1 valid=10s;
     location ~/datalake/v1(.*)$ {
-        resolver 127.0.0.1 valid=10s;
-        set $upstreamName http://dl-feeder:1680/datalake/v1$1;
+        #set $upstreamName http://dl_feeder:1680/datalake/v1$1;
+        include /etc/nginx/upstream.conf;
         proxy_pass $upstreamName;
 
         proxy_ssl_server_name on;
@@ -16,3 +17,4 @@ server {
         proxy_set_header X-Forwarded-Host $server_name;
     }
 }
+
diff --git a/components/datalake-handler/admin/pom.xml b/components/datalake-handler/admin/pom.xml
index cd6e3e8a..5325ba9e 100644
--- a/components/datalake-handler/admin/pom.xml
+++ b/components/datalake-handler/admin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.services.components</groupId>
 		<artifactId>datalake-handler</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
diff --git a/components/datalake-handler/collector/pom.xml b/components/datalake-handler/collector/pom.xml
index a7f40a63..a90b9dff 100644
--- a/components/datalake-handler/collector/pom.xml
+++ b/components/datalake-handler/collector/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.services.components</groupId>
 		<artifactId>datalake-handler</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
diff --git a/components/datalake-handler/feeder/pom.xml b/components/datalake-handler/feeder/pom.xml
index baf1a9f5..3297c7ea 100644
--- a/components/datalake-handler/feeder/pom.xml
+++ b/components/datalake-handler/feeder/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.onap.dcaegen2.services.components</groupId>
 		<artifactId>datalake-handler</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.0.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
diff --git a/components/datalake-handler/pom.xml b/components/datalake-handler/pom.xml
index d244806a..9b00a41e 100644
--- a/components/datalake-handler/pom.xml
+++ b/components/datalake-handler/pom.xml
@@ -12,7 +12,7 @@
 
 	<groupId>org.onap.dcaegen2.services.components</groupId>
 	<artifactId>datalake-handler</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>dcaegen2-service-datalake-handler</name>
diff --git a/components/datalake-handler/version.properties b/components/datalake-handler/version.properties
index 2ddebb39..0f1f46a5 100644
--- a/components/datalake-handler/version.properties
+++ b/components/datalake-handler/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=0
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT