diff options
| author |   Kate Hsuan <kate.hsuan@qct.io> | 2020-03-17 03:46:32 +0000 |
|---|---|---|
| committer | Kate Hsuan <kate.hsuan@qct.io> | 2020-03-19 05:47:02 +0000 |
| commit | a4def1d763dba9ce6b96e09b03d1eaf0105ce1f4 (patch) | |
| tree | 3a26a57dce23d07d4a66fa3742fa38f0b89d4096 /components/datalake-handler/admin/Dockerfile | |
| parent | b58f0c33bf61ecd82cf3a04ece8798dceb9444b8 (diff) | |
Bug fix nginx resover address.
Issue-ID: DCAEGEN2-2008
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
Change-Id: I3e128dd3a05b230320c37ce58fff2fba4be4abff
Diffstat (limited to 'components/datalake-handler/admin/Dockerfile')
| -rw-r--r-- | components/datalake-handler/admin/Dockerfile | 14 |
1 files changed, 11 insertions, 3 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"] |