Merge pull request #1 from appirio-tech/master

Merge latest from upstream.

Author: sah2ed

docker/direct-app/build/token.properties

@@ -1,4 +1,4 @@
-j#######################################################
+#######################################################
 # TopCoder Software Component Development Environment #
 #######################################################
 
@@ -75,8 +75,10 @@ j#######################################################
 ####################
 # cache.properties #
 ####################
-@host_url@=tc-cache:2199
-@cache.primary@=tc-cache:8501
+#@host_url@=tc-cache:2199
+#@cache.primary@=tc-cache:8501
+@cache_client_class@=com.topcoder.web.common.cache.RedisCacheClient
+@redis_uri@=redis://tc-cache:6379
 
 
 ###########################

docker/direct-app/docker-compose.yml

@@ -1,10 +1,29 @@
 version: '2'
 services:
+  tc-cache:
+    image: "redis:3.2.5"
+    ports:
+      - "6379:6379"
   tc-informix:
-    image: "appiriodevops/informix:1b3d4ef"
+    image: "appiriodevops/tc-database-scripts:latest"
     hostname: informix.cloud.topcoder.com
+    container_name: iif_innovator_c
+    environment: 
+      LICENSE: accept
     ports:
       - "2021:2021"
+      - "2022:2022"
+      - "27017:27017"
+      - "27018:27018"
+      - "27883:27883"
+    tty: true
+  docker-elasticsearch-feeder:
+    image: "appiriodevops/docker-elasticsearch:local"
+    links:
+      - "tc-informix"
+    ports:
+       - '9200:9200'
+       - '9300:9300'
   tc-direct-build:
     image: "appiriodevops/direct-app:build"
     volumes:
@@ -14,6 +33,7 @@ services:
     image: "appiriodevops/direct-app:run-volume"
     links:
       - "tc-informix"
+      - "tc-cache"
     hostname: cockpit.cloud.topcoder.com
     volumes:
       - "${BUILT_JBOSS_DIR}:/root/jboss-4.2.3.GA"
@@ -25,9 +45,10 @@ services:
       - "3973:3973"
       - "5446:5446"
   tc-direct:
-    image: "appiriodevops/direct-app:04680b3"
+    image: "appiriodevops/direct-app:latest"
     links:
       - "tc-informix"
+      - "tc-cache"
     hostname: cockpit.cloud.topcoder.com
     ports:
       - "443:443"
@@ -36,3 +57,17 @@ services:
       - "1199:1199"
       - "3973:3973"
       - "5446:5446"
+  run-auto-pilot:
+    image: appiriodevops/online-review:autopilot-1.0
+    container_name: run-auto-pilot
+    links:
+      - tc-informix:db
+  run-online-review:
+    image: appiriodevops/online-review:jboss-1.1
+    container_name: run-online-review
+    environment:
+      - JAVA_OPTS=-Xms512m -Xmx1024m
+    links:
+      - tc-informix:db
+    ports:
+      - "80:8080"

docker/informix/README.md

@@ -3,22 +3,21 @@ We have created a informix docker for use locally, see https://hub.docker.com/r/
 
 So basically, can run it like 
 ```
-docker run -p 2021:2021 -it appiriodevops/informix:1b3d4ef
+docker run -p 2021:2021 -it appiriodevops/informix:6f3884d
 ```
 then you can connect this informix server by using [ServerStudio](https://www.serverstudio.com/)
 or other supported SQL client tool
 
-1b3d4ef tag is the latest version by https://github.com/appirio-tech/tc-database-scripts, if there are new changes, please do as following
+6f3884d tag is the latest version by https://github.com/appirio-tech/tc-database-scripts, if there are new changes, please do as following
 
 ## How to update the informix docker with latest scripts svn
 1. run a container for the informix
 ```
-docker run -it appiriodevops/informix:1b3d4ef bash
+docker run -it appiriodevops/informix:6f3884d bash
 ```
 
 2. cd trunk
-3. svn update (you need to enter your svn username and password)
-make necessory change if you want
+3. make necessory change if you want
 4. oninit
 5. ant reinstall_db
 6. onmode -ky

docker/informix/manual_setup/README.md

@@ -0,0 +1,46 @@
+# Guide
+
+Run the commands 
+```
+# download the image
+docker pull ibmcom/informix-developer-database:latest
+
+# run the informix image
+docker run -it --name iif_developer_edition --privileged -p 9088:9088 -p 9089:9089 -p 27017:27017 -p 27018:27018 -p 27883:27883 -e LICENSE=accept ibmcom/informix-developer-database:latest
+```
+
+Copy the following files to the container:
+* apache-ant-1.9.8-bin.tar.gz - download it from http://mirrors.cnnic.cn/apache//ant/binaries/apache-ant-1.9.8-bin.tar.gz
+* files/ant-libs.tgz - it will extracted to apache-ant
+* tc-database-scripts - download it from https://github.com/appirio-tech/tc-database-scripts
+* files/build.properties - it will be copied to tc-database-scripts
+
+You can use command like `docker cp {file} iif_developer_edition:/` to copy files to the root of the container, where {file} is the file or directory above.
+
+Now log into the container with command `docker exec -it iif_developer_edition bash`, and execute the following commands in the container:
+'''
+# install jdk
+sudo apt-get update
+sudo apt-get install -y openjdk-7-jdk
+
+# extract apache-ant to /opt
+tar -xzvf apache-ant-1.9.8-bin.tar.gz -C /opt
+
+# extract the ant-libs to apache-ant's lib directory
+tar -xzvf /ant-libs.tgz -C /opt/apache-ant-1.9.8/lib
+
+# create 4G datadbs dbspace
+touch /home/informix/data/spaces/datadbs.000
+chmod 660 /home/informix/data/spaces/datadbs.000
+onspaces -c -d datadbs -p /home/informix/data/spaces/datadbs.000 -o 0 -s 4194304
+
+# copy the build.properties to tc-database-scripts
+cp /build.properties /tc-database-scripts
+
+# copy the tc-database-scripts/connfile.sql.example as connfile.sql
+cp /tc-database-scripts/connfile.sql.example /tc-database-scripts/connfile.sql
+
+# go to tc-database-scripts directory and setup db
+cd /tc-database-scripts
+/opt/apache-ant-1.9.8/bin/ant setup_db
+'''

docker/informix/manual_setup/files/ant-libs.tgz

@@ -0,0 +1,40 @@
+# TopCoder Software Component Development Environment 
+
+# Informix environment variables
+INFORMIXDIR=/opt/IBM/informix
+DBACCESS=/opt/IBM/informix/bin/dbaccess
+INFORMIXSERVER=dev
+INFORMIXSQLHOSTS=/opt/IBM/informix/etc/sqlhosts.dev
+
+# Properties to automatically start/stop Jboss. Supposed to be used mostly for Continuos Integration server
+# update_db=uncomment to reinstall db on each redeploy
+jdk_home=<<path to jdk>>
+bind_addr=127.0.0.1
+jnp_port=1099
+jboss_heap_size=512m
+sleep_before_stopping=10
+
+# The location of the deployment directory for JBoss server.
+JBOSS_HOME=<<path_to_jboss>>
+
+# Database server information
+database.server=localhost
+database.port=9088
+database.username=informix
+database.password=in4mix
+
+# Whether to stop running scripts if any script failed.
+stoponerror=true
+
+# SVN credentials
+svn.username=xxx
+svn.password=xxx
+
+# if set, database scripts will be updated before setting up db.
+# svn.update=yes
+
+# Important, a security lock to avoid dropping all databases
+dropdatabase=yes
+
+# OnlineReview repository location to start/stop tools
+or_path=<<or_repository_path>>