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"]
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;
proxy_set_header X-Forwarded-Host $server_name;
}
}
+
<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>
<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>
<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>
<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>
major=1
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT