Merge pull request #130 from xxcxy/dev-maven

fix #124 #125 #126

Author: jpeg22

Dockerfile

@@ -5,18 +5,32 @@ RUN cd /root/ \
        && tar xzf jboss-4.0.2.tar.gz \
        && rm -rf jboss-4.0.2.tar.gz
 
+ENV JAVA_OPTS="-Xms1G -Xmx1G -XX:MaxPermSize=256M -server"
 ENV JBOSS_HOME=/root/jboss-4.0.2
 ENV PATH=$PATH:/root/jboss-4.0.2/bin
+ENV TZ=America/Indiana/Indianapolis
 
 Add ./local/Docker_files/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
-Add ./local/Docker_files/informix-ds.xml /root/jboss-4.0.2/server/default/deploy/
 Add ./web/i /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/i
 Add ./web/css /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/css
 Add ./web/js /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/js
 
 Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
-Add ./local/Docker_files/OnlineReview.xml /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/
+
+RUN mkdir -p /root/web/conf
+Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
+RUN mkdir -p /root/temp/dist-gen
+RUN mkdir -p /nfs_shares/tcssubmissions
+RUN mkdir -p /nfs_shares/studiofiles/submissions
+RUN mkdir -p /nfs_shares/tcs-downloads
+
+## tokenized
+Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
+Add ./token.properties /root/
+RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//g | awk -F '=' '{print "s/@"$1"@/"$2"/g"}' | sed -f /dev/stdin /root/tcs_informix-ds.xml >> /root/jboss-4.0.2/server/default/deploy/informix-ds.xml
+RUN rm /root/token.properties
+RUN rm /root/tcs_informix-ds.xml
+
 Add ./local/Docker_files/AuthorizationHelper.class /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/com/cronos/onlinereview/util/
-Add ./local/Docker_files/cache.properties /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/
 
 CMD ["/root/jboss-4.0.2/bin/run.sh","-DFOREGROUND"]

ECSDockerfile

@@ -8,6 +8,7 @@ RUN cd /root/ \
 ENV JAVA_OPTS="-Xms4G -Xmx4G -XX:MaxPermSize=1G -server"
 ENV JBOSS_HOME=/root/jboss-4.0.2
 ENV PATH=$PATH:/root/jboss-4.0.2/bin
+ENV TZ=America/Indiana/Indianapolis
 
 Add ./jboss_files/lib/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
 Add ./web/i /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/i
@@ -16,6 +17,13 @@ Add ./web/js /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.
 
 Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
 
+RUN mkdir -p /root/web/conf
+Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
+RUN mkdir -p /root/temp/dist-gen
+RUN mkdir -p /nfs_shares/tcssubmissions
+RUN mkdir -p /nfs_shares/studiofiles/submissions
+RUN mkdir -p /nfs_shares/tcs-downloads
+
 ## tokenized
 Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
 Add ./token.properties /root/

MAVEN_COMMAND.md

@@ -16,8 +16,9 @@
 
 ## Run in docker
 
-1. build war dir `mvn clean package`
-2. run `docker-compose up -d` in root dir.
+1. replace `token.properties` to `token.properties.local` on pom.xml line 894
+2. build war dir `mvn clean package`
+3. run `docker-compose up -d` in root dir.
 
 ## Build docker image for dev and prod
 
@@ -30,8 +31,6 @@
 
 ## Note
 
-You need comment `login` and `cache` function when deploying locally.
+You need comment `login` function when deploying locally.
 
-- comment src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java line145-151 and then `return 132456L;`
-- comment web/includes/inc_header.jsp line22
-- comment web/includes/project/project_phase.jsp and web/includes/project/project_resource.jsp all `<tc-webtag:handle` tag
+- comment src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java line145-151 and then `return 132456L;`

docker-compose.yml

@@ -30,4 +30,5 @@ services:
     ports:
       - 8080:8080
     environment:
-      - JAVA_OPTS= -Xms1G -Xmx1G -XX:MaxPermSize=256M -server
+      - JAVA_OPTS= -Xms1G -Xmx1G -XX:MaxPermSize=256M -server
+      - TZ=America/Indiana/Indianapolis