diff --git a/Dockerfile b/Dockerfile index f02bddf8..598e5800 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,18 @@ RUN npm install -g @angular/cli RUN resources/build_automation/build_frontend.sh # New container -FROM tomcat:9.0-jdk8-openjdk -COPY --from=0 SBOLCanvasBackend/WebContent/api.war webapps +FROM tomcat:9.0-jdk8-openjdk +COPY --from=0 /opt/backend/SBOLCanvasBackend/WebContent/api.war webapps + +# Copying configs for tomcat +ARG TOMCAT_AUTOMATION_DIR=/opt/backend/resources/server_automation/tomcat +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/base_config_files/tomcat-users.xml ${TOMCAT_AUTOMATION_DIR}/base_config_files/web.xml conf/ +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/base_config_files/server.xml conf/ +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/base_config_files/manager-context.xml webapps/manager/META-INF/context.xml +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/base_config_files/host-manager-context.xml webapps/host-manager/META-INF/context.xml +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/ROOT_config/index.jsp webapps/ROOT/index.jsp + +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/frontend_config_files/frontend_context.html webapps/canvas/META-INF/context.html +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/frontend_config_files/frontend_rewrite.config webapps/canvas/WEB-INF/rewrite.config +COPY --from=0 ${TOMCAT_AUTOMATION_DIR}/frontend_config_files/frontend_web.xml webapps/canvas/WEB-INF/web.xml diff --git a/resources/build_automation/build_backend.sh b/resources/build_automation/build_backend.sh index 7ba537cc..40045ac4 100755 --- a/resources/build_automation/build_backend.sh +++ b/resources/build_automation/build_backend.sh @@ -17,3 +17,5 @@ javac -source 1.8 -target 1.8 -sourcepath ${compile_source_dir} -d ${compile_des # Build .war file and deploy cd ${BACKEND_DIR}/WebContent jar -cf ${war_filename} * +echo "$PWD" +echo $(ls) diff --git a/resources/build_automation/build_frontend.sh b/resources/build_automation/build_frontend.sh index 9369bdad..69447c95 100755 --- a/resources/build_automation/build_frontend.sh +++ b/resources/build_automation/build_frontend.sh @@ -7,5 +7,7 @@ cur_dir=$(pwd) # Save away our current directory to come back to. cd SBOLCanvasFrontend npm install #ng build --prod --base-href=/canvas/ +npm rebuild node-sass +node --max-old-space-size=8192 ng build --prod --build-optimizer --vendor-chunk --progress --output-hashing=all --stats-json --source-map=true --base-href=/canvas/ diff --git a/resources/server_automation/tomcat/base_config_files/server.xml b/resources/server_automation/tomcat/base_config_files/server.xml index dd679f27..2fa31fe2 100644 --- a/resources/server_automation/tomcat/base_config_files/server.xml +++ b/resources/server_automation/tomcat/base_config_files/server.xml @@ -66,15 +66,12 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 --> - - + - + connectionTimeout="20000"/> - - + -->