open-austin · changtung · Apr 18, 2016 · Apr 28, 2016 · May 8, 2016 · May 8, 2016
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,17 @@
-FROM maven:3.3
+FROM maven:3.3-jdk-8
 MAINTAINER Nathan Walker <[email protected]>
 
+ENV TRANSITIMECORE /transitime-core
+ENV PGPASSWORD=transitime
+ENV AGENCYNAME=CAPMETRO
+ENV AGENCYID=1
+ENV GTFS_URL="https://data.texas.gov/download/r4v4-vz24/application/zip"
+ENV GTFSRTVEHICLEPOSITIONS="https://data.texas.gov/download/eiei-9rpf/application/octet-stream"
+
 RUN apt-get update \
 	&& apt-get install -y postgresql-client \
-	&& apt-get install -y git-core
+	&& apt-get install -y git-core \
+	&& apt-get install -y vim
 
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
@@ -23,10 +31,11 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
 	A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 \
 	DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 \
 	F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE \
-	F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
+	F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23 \
+        4b28deddee6372106aac7ead6af524c7c9614644
 
 ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.0.26
+ENV TOMCAT_VERSION 8.0.46
 ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
 
 RUN set -x \
@@ -39,29 +48,75 @@ RUN set -x \
 
 EXPOSE 8080
 
+
+# Install json parser so we can read API key for CreateAPIKey output
+
+RUN wget http://stedolan.github.io/jq/download/linux64/jq
+
+RUN chmod +x ./jq
+
+RUN cp jq /usr/bin/
+
+RUN git clone https://github.com/scrudden/core.git /transitime-core
+
+#RUN git clone https://github.com/Transitime/core.git /transitime-core
+
+WORKDIR /transitime-core
+
+#RUN git checkout kalman_predictions
+RUN git checkout historical_predictions
+
+#RUN git checkout shade_build_upstream
+
+RUN mvn install -DskipTests
+
 WORKDIR /
+RUN mkdir /usr/local/transitime
+RUN mkdir /usr/local/transitime/db
+RUN mkdir /usr/local/transitime/config
+RUN mkdir /usr/local/transitime/logs
+RUN mkdir /usr/local/transitime/cache
 
-RUN \
-        git clone https://github.com/walkeriniraq/transittime-core.git && \
-        cd transittime-core && \
-        git checkout cap-metro && \
-        mvn install -DskipTests && \
-        cd / && \
-        mkdir /usr/local/transitime && \
-        mkdir /usr/local/transitime/db && \
-        mv /transittime-core/transitime/target/transitime.jar /usr/local/transitime && \
-        mv /transittime-core/transitimeApi/target/api.war /usr/local/tomcat/webapps && \
-        mv /transittime-core/transitime/target/classes/ddl_postgres*.sql /usr/local/transitime/db && \
-        rm -rf /transitime-core && \
-        rm -rf ~/.m2/repository
 
+# Deploy core. The work horse of transiTime.
+RUN cp /transitime-core/transitime/target/*.jar /usr/local/transitime/
+
+# Deploy API which talks to core using RMI calls.
+RUN cp /transitime-core/transitimeApi/target/api.war  /usr/local/tomcat/webapps
+
+# Deploy webapp which is a UI based on the API.
+RUN cp /transitime-core/transitimeWebapp/target/web.war  /usr/local/tomcat/webapps
+
+RUN cp /transitime-core/transitime/target/classes/ddl_postgres*.sql /usr/local/transitime/db
+
+# RUN rm -rf /transitime-core
+# RUN rm -rf ~/.m2/repository
+
+# Scripts required to start transiTime. These are in the order they need to be run.
+ADD bin/check_db_up.sh check_db_up.sh
+ADD bin/generate_sql.sh generate_sql.sh
 ADD bin/create_tables.sh create_tables.sh
 ADD bin/create_api_key.sh create_api_key.sh
-ADD bin/import_cap_metro.sh import_cap_metro.sh
-ADD bin/connect_to_db.sh connect_to_db.sh
+ADD bin/create_webagency.sh create_webagency.sh
+ADD bin/import_gtfs.sh import_gtfs.sh
 ADD bin/start_transitime.sh start_transitime.sh
-ADD config/postgres_hibernate.cfg.xml /usr/local/transitime/hibernate.cfg.xml
-ADD config/transitime.properties /usr/local/transitime/transitime.properties
+ADD bin/get_api_key.sh	get_api_key.sh
+
+# Handy utility to allow you connect directly to database
+ADD bin/connect_to_db.sh connect_to_db.sh
+
+# RUN ./generate_sql.sh
+
+RUN \
+	sed -i 's/\r//' *.sh &&\
+ 	chmod 777 *.sh
+
+ADD config/postgres_hibernate.cfg.xml /usr/local/transitime/config/hibernate.cfg.xml
+ADD config/transitime.properties /usr/local/transitime/config/transitime.properties
+ADD config/transitime.properties /usr/local/transitimeTomcatConfig/transitime.properties
+ADD config/transiTimeConfig.xml /usr/local/transitime/config/transiTimeConfig.xml
+
+EXPOSE 8080
 
 CMD ["/start_transitime.sh"]
 
diff --git a/README.md b/README.md
@@ -1,19 +1,34 @@
-# transitime-db
-
-http://transitime-host.cloudapp.net/api/v1/key/f18a8240/agency/cap-metro/command/predictions?rs=803%7C4830
+# transitime-docker
 
 Things to make transitime go:
 
 - Ubuntu
 - sudo apt-get install git
-- git clone https://github.com/walkeriniraq/transitime-db.git
+- git clone https://github.com/scrudden/transitime-docker.git
 - curl -sSL https://get.docker.com/ | sh  (i.e. install docker)
+- Configure agency details in the go.sh script. Here you set the agency name, agency id** (as in GTFS feed), GTFS feed location and GTFS-realtime vehicle location url.
 - ./go.sh
+- 
+**AgencyId is optional in GTFS so just set to 1 if none specified.
 
 The go script will build the transitime container (takes a long time), start the postgres db, create the tables,
-push the cap metro data into the db, create a default API key (f18a8240) and then start the server, connecting
-it to the server's port 80.
+push the gtfs data into the db, create an API key and then start the api service and web user interface service. 
+
+To view web interface
+```
+http://[ipaddress]:8080/web
+```
+To view api
+```
+http://[ipaddress]:8080/api
+```
+
+You can get the ip address by running
+```
+docker-machine ip [machine name]
+
+docker-machine ip default
+```
+
 
-If you want to run an instance of the transitime app, you can call:
-./run_to_bash.sh
 
diff --git a/bin/check_db_up.sh b/bin/check_db_up.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+export PGPASSWORD=transitime
+
+echo 'Checking database is running.'
+RET=1
+SUCCESS=0
+until [ "$RET" -eq "$SUCCESS" ]; do
+
+	psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres -c "SELECT EXTRACT(DAY FROM TIMESTAMP '2001-02-16 20:38:40');"
+	RET="$?"
+
+	if [ "$RET" -ne "$SUCCESS" ]
+		then
+			echo 'Database is not running.'
+			sleep 10
+	fi    
+done
+
+echo 'Database is now running.'
diff --git a/bin/connect_to_db.sh b/bin/connect_to_db.sh
@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-export PGPASSWORD=transitime
-psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_POST_5432_TCP_PORT" -U postgres -d cap-metro
+psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_POST_5432_TCP_PORT" -U postgres -d $AGENCYNAME 
diff --git a/bin/create_api_key.sh b/bin/create_api_key.sh
@@ -1,20 +1,12 @@
 #!/usr/bin/env bash
-export PGPASSWORD=transitime
-java \
-        -Dtransitime.db.dbName=cap-metro \
-        -Dtransitime.db.dbType=postgresql \
-        -Dtransitime.db.dbUserName=postgres \
-        -Dtransitime.db.dbPassword=$PGPASSWORD \
-        -Dtransitime.core.agencyId=cap-metro \
-        -Dtransitime.hibernate.configFile=/usr/local/transitime/hibernate.cfg.xml \
-        -Dhibernate.connection.url=jdbc:postgresql://$POSTGRES_PORT_5432_TCP_ADDR:$POSTGRES_PORT_5432_TCP_PORT/cap-metro \
-        -Dhibernate.connection.username=postgres \
-        -Dhibernate.connection.password=$PGPASSWORD \
-	-cp /usr/local/transitime/transitime.jar \
-	org.transitime.applications.CreateAPIKey \
-	-d "foo" \
-	-e "[email protected]" \
-	-n "Nathan Walker" \
-	-p "123" \
-	-u "http://foo.bar.com"
 
+# This is to substitute into config file the env values
+sed -i s#"POSTGRES_PORT_5432_TCP_ADDR"#"$POSTGRES_PORT_5432_TCP_ADDR"#g /usr/local/transitime/config/*
+sed -i s#"POSTGRES_PORT_5432_TCP_PORT"#"$POSTGRES_PORT_5432_TCP_PORT"#g /usr/local/transitime/config/*
+sed -i s#"PGPASSWORD"#"$PGPASSWORD"#g /usr/local/transitime/config/*
+sed -i s#"AGENCYNAME"#"$AGENCYNAME"#g /usr/local/transitime/config/*
+sed -i s#"GTFSRTVEHICLEPOSITIONS"#"$GTFSRTVEHICLEPOSITIONS"#g /usr/local/transitime/config/*
+
+cp /usr/local/transitime/config/transitime.properties /usr/local/transitimeTomcatConfig/transitime.properties
+
+java -jar /usr/local/transitime/CreateAPIKey.jar -c "/usr/local/transitime/config/transiTimeConfig.xml" -d "foo" -e "[email protected]" -n "Sean Og Crudden" -p "123456" -u "http://www.transitime.org"
diff --git a/bin/create_tables.sh b/bin/create_tables.sh
@@ -1,15 +1,14 @@
 #!/usr/bin/env bash
-export PGPASSWORD=transitime
-createdb -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres cap-metro
+createdb -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres $AGENCYNAME
 psql \
 	-h "$POSTGRES_PORT_5432_TCP_ADDR" \
 	-p "$POSTGRES_PORT_5432_TCP_PORT" \
 	-U postgres \
-	-d cap-metro \
+	-d $AGENCYNAME \
 	-f /usr/local/transitime/db/ddl_postgres_org_transitime_db_structs.sql
 psql \
 	-h "$POSTGRES_PORT_5432_TCP_ADDR" \
 	-p "$POSTGRES_PORT_5432_TCP_PORT" \
 	-U postgres \
-	-d cap-metro \
+	-d $AGENCYNAME \
 	-f /usr/local/transitime/db/ddl_postgres_org_transitime_db_webstructs.sql
diff --git a/bin/create_webagency.sh b/bin/create_webagency.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# This is to substitute into config file the env values
+sed -i s#"POSTGRES_PORT_5432_TCP_ADDR"#"$POSTGRES_PORT_5432_TCP_ADDR"#g /usr/local/transitime/config/*
+sed -i s#"POSTGRES_PORT_5432_TCP_PORT"#"$POSTGRES_PORT_5432_TCP_PORT"#g /usr/local/transitime/config/*
+sed -i s#"PGPASSWORD"#"$PGPASSWORD"#g /usr/local/transitime/config/*
+sed -i s#"AGENCYNAME"#"$AGENCYNAME"#g /usr/local/transitime/config/*
+sed -i s#"GTFSRTVEHICLEPOSITIONS"#"$GTFSRTVEHICLEPOSITIONS"#g /usr/local/transitime/config/*
+
+cp /usr/local/transitime/config/transitime.properties /usr/local/transitimeTomcatConfig/transitime.properties
+
+java -Dtransitime.db.dbName=$AGENCYNAME -Dtransitime.hibernate.configFile=/usr/local/transitime/config/hibernate.cfg.xml -Dtransitime.db.dbHost=$POSTGRES_PORT_5432_TCP_ADDR:$POSTGRES_PORT_5432_TCP_PORT -Dtransitime.db.dbUserName=postgres -Dtransitime.db.dbPassword=$PGPASSWORD -Dtransitime.db.dbType=postgresql -cp transitime-core/transitime/target/CreateAPIKey.jar org.transitime.db.webstructs.WebAgency $AGENCYID 127.0.0.1 $AGENCYNAME postgresql $POSTGRES_PORT_5432_TCP_ADDR postgres $PGPASSWORD    
diff --git a/bin/generate_sql.sh b/bin/generate_sql.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+java -jar $TRANSITIMECORE/transitime/target/SchemaGenerator.jar -p org.transitime.db.structs -o /usr/local/transitime/db/
+java -jar $TRANSITIMECORE/transitime/target/SchemaGenerator.jar -p org.transitime.db.webstructs -o /usr/local/transitime/db/
+
+
+
diff --git a/bin/get_api_key.sh b/bin/get_api_key.sh
@@ -0,0 +1 @@
+psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres -d $AGENCYNAME -t -c "SELECT applicationkey from apikeys;"|xargs
diff --git a/bin/import_cap_metro.sh b/bin/import_cap_metro.sh
diff --git a/bin/import_gtfs.sh b/bin/import_gtfs.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# This is to substitute into config file the env values. 
+sed -i s#"POSTGRES_PORT_5432_TCP_ADDR"#"$POSTGRES_PORT_5432_TCP_ADDR"#g /usr/local/transitime/config/*
+sed -i s#"POSTGRES_PORT_5432_TCP_PORT"#"$POSTGRES_PORT_5432_TCP_PORT"#g /usr/local/transitime/config/*
+sed -i s#"PGPASSWORD"#"$PGPASSWORD"#g /usr/local/transitime/config/*
+sed -i s#"AGENCYNAME"#"$AGENCYNAME"#g /usr/local/transitime/config/*
+sed -i s#"GTFSRTVEHICLEPOSITIONS"#"$GTFSRTVEHICLEPOSITIONS"#g /usr/local/transitime/config/*
+
+cp /usr/local/transitime/config/transitime.properties /usr/local/transitimeTomcatConfig/transitime.properties
+
+java -Xmx1000M -Dtransitime.core.agencyId=$AGENCYID -Dtransitime.configFiles=/usr/local/transitime/config/transiTimeConfig.xml -Dtransitime.logging.dir=/usr/local/transitime/logs/ -Dlogback.configurationFile=$TRANSITIMECORE/transitime/src/main/resouces/logbackGtfs.xml -jar $TRANSITIMECORE/transitime/target/GtfsFileProcessor.jar -gtfsUrl $GTFS_URL -maxTravelTimeSegmentLength 400
+
+psql \
+	-h "$POSTGRES_PORT_5432_TCP_ADDR" \
+	-p "$POSTGRES_PORT_5432_TCP_PORT" \
+	-U postgres \
+	-d $AGENCYNAME \
+	-c "update activerevisions set configrev=0 where configrev = -1; update activerevisions set traveltimesrev=0 where traveltimesrev = -1;"
+
diff --git a/bin/start_transitime.sh b/bin/start_transitime.sh
@@ -1,15 +1,27 @@
 #!/usr/bin/env bash
-export PGPASSWORD=transitime
-echo "hibernate.connection.url=jdbc:postgresql://$POSTGRES_PORT_5432_TCP_ADDR:$POSTGRES_PORT_5432_TCP_PORT/cap-metro" >> /usr/local/transitime/transitime.properties
+
+# This is to substitute into config file the env values
+sed -i s#"POSTGRES_PORT_5432_TCP_ADDR"#"$POSTGRES_PORT_5432_TCP_ADDR"#g /usr/local/transitime/config/*
+sed -i s#"POSTGRES_PORT_5432_TCP_PORT"#"$POSTGRES_PORT_5432_TCP_PORT"#g /usr/local/transitime/config/*
+sed -i s#"PGPASSWORD"#"$PGPASSWORD"#g /usr/local/transitime/config/*
+sed -i s#"AGENCYNAME"#"$AGENCYNAME"#g /usr/local/transitime/config/*
+sed -i s#"GTFSRTVEHICLEPOSITIONS"#"$GTFSRTVEHICLEPOSITIONS"#g /usr/local/transitime/config/*
+
+cp /usr/local/transitime/config/transitime.properties /usr/local/transitimeTomcatConfig/transitime.properties
+
+rmiregistry &
+
+#set the API as an environment variable so we can set in JSP of template/includes.jsp in the transitime webapp
+export APIKEY=$(/get_api_key.sh)
+
+# make it so we can also access as a system property in the JSP
+export JAVA_OPTS="$JAVA_OPTS -Dtransitime.apikey=$(/get_api_key.sh)"
+
+echo JAVA_OPTS $JAVA_OPTS
+
 /usr/local/tomcat/bin/startup.sh
-java \
-    -Dtransitime.hibernate.configFile=/usr/local/transitime/hibernate.cfg.xml \
-    -Dhibernate.connection.url=jdbc:postgresql://$POSTGRES_PORT_5432_TCP_ADDR:$POSTGRES_PORT_5432_TCP_PORT/cap-metro \
-    -Dhibernate.connection.username=postgres \
-    -Dhibernate.connection.password=$PGPASSWORD \
-    -Dtransitime.avl.gtfsRealtimeFeedURI="https://data.texas.gov/download/i5qp-g5fd/application/octet-stream" \
-    -Dtransitime.modules.optionalModulesList=org.transitime.avl.GtfsRealtimeModule \
-    -Dtransitime.core.agencyId=cap-metro \
-    -cp /usr/local/transitime/transitime.jar \
-	org.transitime.applications.Core
+
+java -Dtransitime.configFiles=/usr/local/transitime/config/transiTimeConfig.xml -Dtransitime.core.agencyId=$AGENCYID -Dtransitime.logging.dir=/usr/local/transitime/logs/ -jar $TRANSITIMECORE/transitime/target/Core.jar -configRev 0 /dev/null 2>&1
+
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		psql -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres -d $AGENCYNAME -t -c "SELECT applicationkey from apikeys;"\|xargs