Skip to content

Commit e5dbaa4

Browse files
authored
Merge pull request #130 from xxcxy/dev-maven
fix #124 #125 #126
2 parents d2e5627 + 799ff9a commit e5dbaa4

File tree

9 files changed

+312
-5816
lines changed

9 files changed

+312
-5816
lines changed

Dockerfile

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,32 @@ RUN cd /root/ \
55
&& tar xzf jboss-4.0.2.tar.gz \
66
&& rm -rf jboss-4.0.2.tar.gz
77

8+
ENV JAVA_OPTS="-Xms1G -Xmx1G -XX:MaxPermSize=256M -server"
89
ENV JBOSS_HOME=/root/jboss-4.0.2
910
ENV PATH=$PATH:/root/jboss-4.0.2/bin
11+
ENV TZ=America/Indiana/Indianapolis
1012

1113
Add ./local/Docker_files/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
12-
Add ./local/Docker_files/informix-ds.xml /root/jboss-4.0.2/server/default/deploy/
1314
Add ./web/i /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/i
1415
Add ./web/css /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/css
1516
Add ./web/js /root/jboss-4.0.2/server/default/deploy/jbossweb-tomcat55.sar/ROOT.war/js
1617

1718
Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
18-
Add ./local/Docker_files/OnlineReview.xml /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/
19+
20+
RUN mkdir -p /root/web/conf
21+
Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
22+
RUN mkdir -p /root/temp/dist-gen
23+
RUN mkdir -p /nfs_shares/tcssubmissions
24+
RUN mkdir -p /nfs_shares/studiofiles/submissions
25+
RUN mkdir -p /nfs_shares/tcs-downloads
26+
27+
## tokenized
28+
Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
29+
Add ./token.properties /root/
30+
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
31+
RUN rm /root/token.properties
32+
RUN rm /root/tcs_informix-ds.xml
33+
1934
Add ./local/Docker_files/AuthorizationHelper.class /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/com/cronos/onlinereview/util/
20-
Add ./local/Docker_files/cache.properties /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/
2135

2236
CMD ["/root/jboss-4.0.2/bin/run.sh","-DFOREGROUND"]

ECSDockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ RUN cd /root/ \
88
ENV JAVA_OPTS="-Xms4G -Xmx4G -XX:MaxPermSize=1G -server"
99
ENV JBOSS_HOME=/root/jboss-4.0.2
1010
ENV PATH=$PATH:/root/jboss-4.0.2/bin
11+
ENV TZ=America/Indiana/Indianapolis
1112

1213
Add ./jboss_files/lib/ifxjdbc.jar /root/jboss-4.0.2/server/default/lib/
1314
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.
1617

1718
Add ./target/review /root/jboss-4.0.2/server/default/deploy/review.war
1819

20+
RUN mkdir -p /root/web/conf
21+
Add ./conf/distribution_scripts /root/web/conf/distribution_scripts
22+
RUN mkdir -p /root/temp/dist-gen
23+
RUN mkdir -p /nfs_shares/tcssubmissions
24+
RUN mkdir -p /nfs_shares/studiofiles/submissions
25+
RUN mkdir -p /nfs_shares/tcs-downloads
26+
1927
## tokenized
2028
Add ./jboss_files/deploy/tcs_informix-ds.xml /root/
2129
Add ./token.properties /root/

MAVEN_COMMAND.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
## Run in docker
1818

19-
1. build war dir `mvn clean package`
20-
2. run `docker-compose up -d` in root dir.
19+
1. replace `token.properties` to `token.properties.local` on pom.xml line 894
20+
2. build war dir `mvn clean package`
21+
3. run `docker-compose up -d` in root dir.
2122

2223
## Build docker image for dev and prod
2324

@@ -30,8 +31,6 @@
3031

3132
## Note
3233

33-
You need comment `login` and `cache` function when deploying locally.
34+
You need comment `login` function when deploying locally.
3435

35-
- comment src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java line145-151 and then `return 132456L;`
36-
- comment web/includes/inc_header.jsp line22
37-
- comment web/includes/project/project_phase.jsp and web/includes/project/project_resource.jsp all `<tc-webtag:handle` tag
36+
- comment src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java line145-151 and then `return 132456L;`

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ services:
3030
ports:
3131
- 8080:8080
3232
environment:
33-
- JAVA_OPTS= -Xms1G -Xmx1G -XX:MaxPermSize=256M -server
33+
- JAVA_OPTS= -Xms1G -Xmx1G -XX:MaxPermSize=256M -server
34+
- TZ=America/Indiana/Indianapolis

0 commit comments

Comments
 (0)