Skip to content

Commit 711cd9f

Browse files
authored
Merge pull request #136 from xxcxy/dev-maven
using fake email and fix sso on local docker deployment
2 parents 3dbd91e + 0dc22a1 commit 711cd9f

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,4 @@ RUN cat /root/token.properties | grep -v '^#' | grep -v '^$'| sed s/\\//\\\\\\//
3131
RUN rm /root/token.properties
3232
RUN rm /root/tcs_informix-ds.xml
3333

34-
Add ./local/Docker_files/AuthorizationHelper.class /root/jboss-4.0.2/server/default/deploy/review.war/WEB-INF/classes/com/cronos/onlinereview/util/
35-
3634
CMD ["/root/jboss-4.0.2/bin/run.sh","-DFOREGROUND"]

MAVEN_COMMAND.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
## Run in docker
1818

1919
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.
20+
2. add `127.0.0.1 local.topcoder-dev.com` to your hosts
21+
3. build war dir `mvn clean package`
22+
4. run `docker-compose up -d` in root dir.
23+
5. open `https://topcoder-dev.com/login` and use `dok/appirio123` to login.
24+
6. open `http://local.topcoder-dev.com:8080/review`
2225

2326
## Build docker image for dev and prod
2427

@@ -28,9 +31,3 @@
2831
1. build war dir `mvn clean package`
2932
2. run `docker build -t tc-online-review:dev -f ECSDockerfile --platform=linux/amd64 .` in root dir.
3033
3. run `docker-compose -f docker-compose-dev.yml up -d` in root dir to start docker container.
31-
32-
## Note
33-
34-
You need comment `login` function when deploying locally.
35-
36-
- comment src/main/java/com/cronos/onlinereview/util/AuthorizationHelper.java line145-151 and then `return 132456L;`

docker-compose.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ services:
44
image: "redis:3.2.10"
55
ports:
66
- "6379:6379"
7+
tc-fakesmtp:
8+
image: munkyboy/fakesmtp
9+
ports:
10+
- "1025:25"
711
tc-informix:
812
image: "tc-informix:latest"
913
platform: linux/amd64
@@ -25,10 +29,12 @@ services:
2529
image: tc-online-review:latest
2630
depends_on:
2731
- tc-informix
32+
- tc-cache
33+
- tc-fakesmtp
2834
build:
2935
context: .
3036
ports:
3137
- 8080:8080
3238
environment:
3339
- JAVA_OPTS= -Xms1G -Xmx1G -XX:MaxPermSize=256M -server
34-
- TZ=America/Indiana/Indianapolis
40+
- TZ=America/Indiana/Indianapolis

local/db/alter_tc_db.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ myfatal $? "*** Startup of ${INFORMIXSERVER} FAILED***"
3737
echo "*** Startup of ${INFORMIXSERVER} SUCCESS ***"
3838

3939
echo "alter table 'informix'.upload add (url varchar(100))" | dbaccess tcs_catalog > /dev/null 2>&1
40+
echo "update security_user set password='7dGdrcJuCUm4M9JZLae12Q=='" | dbaccess common_oltp > /dev/null 2>&1
4041
myfatal $? "ALTER TABLE FAILED"
4142

4243
onmode -ky

token.properties.local

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ redis.host_url=redis://tc-cache:6379
5555
## Parameters used by EmailEngine.xml #
5656
#######################################
5757
# typical VM and windows configuration
58-
emailengine_smtp_host=localhost
58+
emailengine_smtp_host=tc-fakesmtp
5959
emailengine_smtp_port=25
6060
6161
emailengine_smtp_password=top_coder
@@ -73,7 +73,7 @@ AOLICQ_SERVER_NAME=63.118.154.179
7373
WINFORMULA_SERVER_NAME=tc.cloud.topcoder.com/winformula
7474
CSF_SERVER_NAME=csf.dev.topcoder.com
7575
CORP_SERVER_NAME=www.topcoder-dev.com/corp
76-
SOFTWARE_SERVER_NAME=software.topcoder-dev.com
76+
SOFTWARE_SERVER_NAME=local.topcoder-dev.com:8443
7777
FORUMS_SERVER_NAME=forums.dev.topcoder.com
7878
HOST_URL=localhost:1099
7979
FORUMS_HOST_URL=jnp://localhost:1099
@@ -94,10 +94,11 @@ STUDIO_SERVICES_PROTOCOL=cockpitDomain
9494
COCKPIT_PROVIDER_URL=jnp://184.73.115.186:1399
9595
TERMS_OF_USE_HOST_URL=jnp://localhost:1099
9696
SSO_COOKIE_KEY=tcsso
97-
SSO_HASH_SECRET=GKDKJF80dbdc541fe829898aa01d9e30118bab5d6b9fe94fd052a40069385f5628
97+
#SSO_HASH_SECRET=GKDKJF80dbdc541fe829898aa01d9e30118bab5d6b9fe94fd052a40069385f5628
98+
SSO_HASH_SECRET=Yb2oMAtUoJyl6LvHEnRYF1Q5u5ags7DN6PXgDPZAU9Ku68k7wTJHIDaIT0DjXYubam
9899

99100
#for local deployment, you'll need to add 127.0.0.1 local.host mapping to your hosts file
100-
SSO_DOMAIN=uat.local.com
101+
SSO_DOMAIN=topcoder.com
101102

102103
CLIENT_ID_AUTH0 = JFDo7HMkf0q2CkVFHojy3zHWafziprhT
103104
REDIRECT_URL_AUTH0 = /reg2/callback.action

0 commit comments

Comments
 (0)