X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc-web%2Fsrc%2Fmain%2Fdocker%2FDockerfile;h=a552137f516585e592a20e50d3dac6a417272eba;hb=eeca2684f61b9f88bea49ca2fbfd5e597b139426;hp=37de7166c61228a1ad480468285f813b356ef6c5;hpb=6862799321b85f364a3fa1be8639bed1de3b9d23;p=sdnc%2Foam.git

diff --git a/installation/sdnc-web/src/main/docker/Dockerfile b/installation/sdnc-web/src/main/docker/Dockerfile
index 37de7166..a552137f 100644
--- a/installation/sdnc-web/src/main/docker/Dockerfile
+++ b/installation/sdnc-web/src/main/docker/Dockerfile
@@ -21,33 +21,33 @@
 
 # Base bitnami nginx image
 FROM ${base.image.repo}
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
+LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)"
 
 # copy ODLUX files to nginx
 COPY html /opt/bitnami/nginx/html  
 
 # copy site conf files 
-COPY http_site.conf /opt/bitnami/nginx/conf/server_blocks/
-COPY https_site.conf /opt/bitnami/nginx/conf/server_blocks/
+COPY *.conf /opt/bitnami/nginx/conf/server_blocks/
 
 # setup environment variables
 ENV WEBPROTOCOL="HTTP" \
-	WEBPORT="8080" \
-	SDNRPROTOCOL="HTTP" \
-	SDNRHOST="172.18.0.3" \
-	SDNRPORT="8181" \
-	LOCALDNS="127.0.0.11" \
-	SSL_CERT_DIR="/app/cert" \
-	SSL_CERTIFICATE="cert.pem" \
-	SSL_CERTIFICATE_KEY="cert.key"
+    WEBPORT="8080" \
+    SDNRPROTOCOL="HTTP" \
+    SDNRHOST="172.18.0.3" \
+    SDNRPORT="8181" \
+    TRPCEURL="" \
+    TOPOURL="" \
+    TILEURL="" \
+    DNS_RESOLVER="1.1.1.1" \
+    SSL_CERT_DIR="/app/cert" \
+    SSL_CERTIFICATE="cert.pem" \
+    SSL_CERTIFICATE_KEY="cert.key"
 
 # Check if /app can be used. If so, create "custom" directory and copy the files there.
-COPY bin/configure.sh /opt/bitnami/nginx/sbin
-COPY bin/run.sh /opt/bitnami/nginx/sbin
+COPY bin/*.sh /opt/bitnami/nginx/sbin/
 
 USER root
-RUN chmod +x /opt/bitnami/nginx/sbin/configure.sh
-RUN chmod +x /opt/bitnami/nginx/sbin/run.sh
+RUN chmod +x /opt/bitnami/nginx/sbin/configure.sh /opt/bitnami/nginx/sbin/run.sh
 # By default, docker copies files with the permissions of the build user. To avoid cases where build user 
 # has 644 which can result in failure of certain commands
 RUN chmod -R g+w /opt/bitnami/nginx/html/odlux