From d332e89eb9bbaf280604c61715422dde3542813c Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 12 Jul 2017 16:26:42 -0400 Subject: Configure parent to skip deploy step Change-Id: If65458934e12e3f7f61cf080ba8f99d7d233f291 Signed-off-by: Christopher Lott (cl778h) --- deliveries/os_Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'deliveries/os_Dockerfile') diff --git a/deliveries/os_Dockerfile b/deliveries/os_Dockerfile index 36ecd85f..d4bfeda2 100644 --- a/deliveries/os_Dockerfile +++ b/deliveries/os_Dockerfile @@ -55,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. @@ -75,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} # Define default command. #CMD ["bash"] CMD ["/PROJECT/OpenSource/UbuntuEP/configure-and-run.sh"] -- cgit 1.2.3-korg