X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deliveries%2Fos_Dockerfile;h=130244da4f07c7988e6eb9630b7d5f4a3e016a1c;hb=cc805e781c5c764860a1f801e637c6ed6e471f63;hp=b322b547acb270623e2bbaf2566783a0bfbd2a11;hpb=19de351f906523ed86b0221ebea33a8ac2bac9bc;p=portal.git

diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile
index b322b547..130244da 100644
--- a/deliveries/os_Dockerfile
+++ b/deliveries/os_Dockerfile
@@ -3,6 +3,15 @@
 
 FROM ubuntu:14.04
 
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+
+RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
+    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
+
 # Install the python script required for "add-apt-repository"
 RUN apt-get update && apt-get install -y software-properties-common
 
@@ -46,17 +55,18 @@ ARG PORTAL_SDK_DIR=${PORTAL_SDK_DIR}
 ARG PORTAL_DBC_DIR=${PORTAL_DBC_DIR}
 # Set up variables:
 ENV TOMCATHOME /opt/apache-tomcat-8.0.37
-ENV SDKHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP
+ENV PORTALHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP
 ENV PORTALSDKHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP
 ENV PORTALDBCHOME /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP
 # Install Common Software,Git,Apache
-RUN mkdir -p $SDKHOME &&  mkdir -p $PORTALSDKHOME &&  mkdir -p $PORTALDBCHOME
+RUN mkdir -p $PORTALHOME &&  mkdir -p $PORTALSDKHOME &&  mkdir -p $PORTALDBCHOME
 
-COPY ${SDK_DIR} ${SDKHOME}/ 
+COPY ${SDK_DIR} ${PORTALHOME}/ 
+# step 33 
 COPY ${PORTAL_SDK_DIR} ${PORTALSDKHOME}/
 COPY ${PORTAL_DBC_DIR} ${PORTALDBCHOME}/
 
-RUN ln -s ${SDKHOME} ${TOMCATHOME}/webapps/ECOMPPORTAL &&  ln -s ${PORTALSDKHOME} ${TOMCATHOME}/webapps/ECOMPSDKAPP &&  ln -s ${PORTALDBCHOME} ${TOMCATHOME}/webapps/ECOMPDBCAPP
+RUN ln -s ${PORTALHOME} ${TOMCATHOME}/webapps/ECOMPPORTAL &&  ln -s ${PORTALSDKHOME} ${TOMCATHOME}/webapps/ECOMPSDKAPP &&  ln -s ${PORTALDBCHOME} ${TOMCATHOME}/webapps/ECOMPDBCAPP
 
 
 # Define working directory.
@@ -66,9 +76,9 @@ VOLUME ${TOMCATHOME}/logs
 ENV PATH $PATH:$JAVA_HOME/bin:${TOMCATHOME}/bin
 COPY configure-and-run.sh /PROJECT/OpenSource/UbuntuEP/ 
 
-#RUN cp -r ${FE_DIR}/dist/public  ${SDKHOME}/public
+#RUN cp -r ${FE_DIR}/dist/public  ${PORTALHOME}/public
 
-COPY ${FE_DIR}/dist/public ${SDKHOME}
+COPY ${FE_DIR}/dist/public ${PORTALHOME}/public
 # Define default command.
 #CMD ["bash"]
 CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"]