From 0c954dafa73abf8cfced02c6852fcdad97bdd293 Mon Sep 17 00:00:00 2001
From: ikespand <spandey.ike@gmail.com>
Date: Wed, 23 Dec 2020 18:04:54 +0100
Subject: [PATCH 1/4] Updated Dockerfile with new maven link

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e56f389..db42d19 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>"
 ENV OTP_VERSION=1.4.0
 ENV JAVA_OPTIONS=-Xmx1G
 
-ADD http://central.maven.org/maven2/org/opentripplanner/otp/$OTP_VERSION/otp-$OTP_VERSION-shaded.jar /usr/local/share/java/
+ADD https://repo1.maven.org/maven2/org/opentripplanner/otp/$OTP_VERSION/otp-$OTP_VERSION-shaded.jar /usr/local/share/java/
 
 RUN ln -s otp-$OTP_VERSION-shaded.jar /usr/local/share/java/otp.jar
 

From 6f758e742a9fca84b3f54bbc718e20deaae585cd Mon Sep 17 00:00:00 2001
From: ikespand <spandey.ike@gmail.com>
Date: Wed, 23 Dec 2020 22:24:31 +0100
Subject: [PATCH 2/4] Updated for version 2 of OTP

---
 .gitignore         |  2 +-
 Dockerfile         |  8 +++---
 README.md          | 62 ++++++++++++++++++++++++++++------------------
 docker-compose.yml | 14 ++++-------
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2fcf749..68b9031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 *.obj
 *.pbf
 *.zip
-
+.DS_Store
 graphs/
 osmconvert*
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index db42d19..b0e0495 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM java:8-alpine
-LABEL maintainer="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>"
+FROM lpicanco/java11-alpine:11.0
+LABEL authors="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>, Sandeep Pandey <spandey.ike@gmail.com"
 
-ENV OTP_VERSION=1.4.0
-ENV JAVA_OPTIONS=-Xmx1G
+ENV OTP_VERSION=2.0.0
+ENV JAVA_OPTIONS=-Xmx2G
 
 ADD https://repo1.maven.org/maven2/org/opentripplanner/otp/$OTP_VERSION/otp-$OTP_VERSION-shaded.jar /usr/local/share/java/
 
diff --git a/README.md b/README.md
index 5a1cc52..aaa00d4 100644
--- a/README.md
+++ b/README.md
@@ -4,49 +4,52 @@
 
 ## Usage
 
-Build graphs using GTFS and OSM extract in the current directory:
+Build the docker image from the Dockerfile:
 
 ```shell
-docker run \
-  -v $PWD:/graphs \
-  -e JAVA_OPTIONS=-Xmx4G \
-  urbica/otp --build /graphs
+docker build -t my_docker_id/otp .
 ```
 
-Run OTP server:
+Build graphs using GTFS and OSM extract in the current directory:
 
 ```shell
 docker run \
-  -p 8080:8080 \
-  -v $PWD:/var/otp/graphs \
-  -e JAVA_OPTIONS=-Xmx4G \
-  otp --server --autoScan --verbose
+-v $PWD/graphs:/var/otp/graphs \
+-e JAVA_OPTIONS=-Xmx4G \
+my_docker_id/otp --build \
+--save /var/otp/graphs/city_name
 ```
 
-...or run OTP server with analyst module:
+Run OTP server by loading the graph, and exposing OTP's port 8080 to our machine's port 8080:
 
 ```shell
 docker run \
   -p 8080:8080 \
-  -v $PWD:/graphs \
+  -v $PWD/graphs:/var/otp/graphs \
   -e JAVA_OPTIONS=-Xmx4G \
-  urbica/otp --basePath /data --server --analyst --autoScan --verbose
+  my_docker_id/otp --load /var/otp/graphs/city_name/
 ```
 
+It seems [Analyst API ](https://docs.opentripplanner.org/en/latest/OTP2-MigrationGuide/#analyst "Analyst API ")have been removed in this version.
+
 ## Basic Tutorial
 
-Based on [OpenTripPlanner Basic Tutorial](https://opentripplanner.readthedocs.io/en/latest/Basic-Tutorial/).
+Based on [OpenTripPlanner Basic Tutorial](https://docs.opentripplanner.org/en/latest/Basic-Tutorial/).
 
 ### Get some data
-
-Get GTFS for Transit Schedules and Stops
+Clone this repo to your machine.
+```shell
+git clone https://github.com/ikespand/docker-otp
+cd docker-otp
+```
+Get GTFS for Transit Schedules and Stops (As a sample for Portland),
 
 ```shell
 mkdir -p ./graphs/portland
 wget "http://developer.trimet.org/schedule/gtfs.zip" -O ./graphs/portland/trimet.gtfs.zip
 ```
 
-Get OSM extract for Streets
+Get OpenStreetMap extract for the streets. osmconvert step is used to reduce the data size, you can skip this step if you've allocated sufficient memory to your docker. Otherwise [download](hthttps://wiki.openstreetmap.org/wiki/Osmconvert#Binariestp:// "download") osmconvert.
 
 ```shell
 wget http://download.geofabrik.de/north-america/us/oregon-latest.osm.pbf
@@ -56,30 +59,41 @@ mv portland.pbf ./graphs/portland
 
 ### Start up OTP
 
-Build graph
+Build the docker image from the Dockerfile:
+
+```shell
+docker build -t ikespand/otp .
+```
+
+Build graphs using GTFS and OSM extract in the current directory:
 
 ```shell
 docker run \
-  -v $PWD/graphs:/var/otp/graphs \
-  -e JAVA_OPTIONS=-Xmx4G \
-  urbica/otp --build /var/otp/graphs/portland
+ -v $PWD/graphs:/var/otp/graphs \
+ -e JAVA_OPTIONS=-Xmx4G \
+ ikespand/otp --build \
+ --save /var/otp/graphs/portland
 ```
 
-Run OTP server:
+Run OTP server by loading the graph, and exposing OTP's port 8080 to our machine's port 8080:
 
 ```shell
 docker run \
   -p 8080:8080 \
   -v $PWD/graphs:/var/otp/graphs \
   -e JAVA_OPTIONS=-Xmx4G \
-  urbica/otp --server --autoScan --verbose
+  ikespand/otp --load /var/otp/graphs/portland
 ```
 
+Alternatively, modify the `docker-compose.yml` and then execute:
+```shell
+docker-compose up
+```
 The graph build operation should take about one minute to complete, and then you'll see a Grizzly server running message. At this point you have an OpenTripPlanner server running locally and can open http://localhost:8080/ in a web browser. You should be presented with a web client that will interact with your local OpenTripPlanner instance.
 
 This map-based user interface is in fact sending HTTP GET requests to the OTP server running on your local machine. It can be informative to watch the HTTP requests and responses being generated using the developer tools in your web browser.
 
-### Usage
+### Resources
 
 There are a number of different resources available through the HTTP API. Besides trip planning, OTP can also look up information about transit routes and stops from the GTFS you loaded and return this information as JSON. For example:
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 738bebc..51873d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,17 @@
-version: '3.7'
+version: '2.0'
 
 services:
   otp:
-    image: otp
+    image: ikespand/otp
     restart: unless-stopped
     ports:
       - 8080:8080
     volumes:
       - ./graphs:/var/otp/graphs
     environment:
-      - JAVA_OPTIONS=-Xmx8G
+      - JAVA_OPTIONS=-Xmx2G
     command:
       [
-        '--server',
-        '--maxThreads 4',
-        '--analyst',
-        '--autoScan',
-        '--insecure',
-        '--verbose',
+        '--load /var/otp/graphs/stuttgart',
+        '--maxThreads 4'
       ]

From a8f5321eed1b7554d020802495e93498844517b5 Mon Sep 17 00:00:00 2001
From: Tariq Baig-Meininghaus <tariq.baig@ds.mpg.de>
Date: Wed, 13 Apr 2022 16:47:34 +0200
Subject: [PATCH 3/4] changed image tags to containe urbica

---
 Dockerfile         |  4 ++--
 README.md          | 23 ++++-------------------
 docker-compose.yml |  2 +-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b0e0495..837d3c3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-FROM lpicanco/java11-alpine:11.0
-LABEL authors="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>, Sandeep Pandey <spandey.ike@gmail.com"
+FROM java11-alpine:11.0
+LABEL authors="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>, Sandeep Pandey <spandey.ike@gmail.com, Tariq Baig-Meininghaus tarbaig@gmail.com"
 
 ENV OTP_VERSION=2.0.0
 ENV JAVA_OPTIONS=-Xmx2G
diff --git a/README.md b/README.md
index aaa00d4..72b465e 100644
--- a/README.md
+++ b/README.md
@@ -4,19 +4,13 @@
 
 ## Usage
 
-Build the docker image from the Dockerfile:
-
-```shell
-docker build -t my_docker_id/otp .
-```
-
 Build graphs using GTFS and OSM extract in the current directory:
 
 ```shell
 docker run \
 -v $PWD/graphs:/var/otp/graphs \
 -e JAVA_OPTIONS=-Xmx4G \
-my_docker_id/otp --build \
+urbica/otp --build \
 --save /var/otp/graphs/city_name
 ```
 
@@ -27,7 +21,7 @@ docker run \
   -p 8080:8080 \
   -v $PWD/graphs:/var/otp/graphs \
   -e JAVA_OPTIONS=-Xmx4G \
-  my_docker_id/otp --load /var/otp/graphs/city_name/
+  urbica/otp --load /var/otp/graphs/city_name/
 ```
 
 It seems [Analyst API ](https://docs.opentripplanner.org/en/latest/OTP2-MigrationGuide/#analyst "Analyst API ")have been removed in this version.
@@ -37,11 +31,6 @@ It seems [Analyst API ](https://docs.opentripplanner.org/en/latest/OTP2-Migratio
 Based on [OpenTripPlanner Basic Tutorial](https://docs.opentripplanner.org/en/latest/Basic-Tutorial/).
 
 ### Get some data
-Clone this repo to your machine.
-```shell
-git clone https://github.com/ikespand/docker-otp
-cd docker-otp
-```
 Get GTFS for Transit Schedules and Stops (As a sample for Portland),
 
 ```shell
@@ -59,11 +48,7 @@ mv portland.pbf ./graphs/portland
 
 ### Start up OTP
 
-Build the docker image from the Dockerfile:
 
-```shell
-docker build -t ikespand/otp .
-```
 
 Build graphs using GTFS and OSM extract in the current directory:
 
@@ -71,7 +56,7 @@ Build graphs using GTFS and OSM extract in the current directory:
 docker run \
  -v $PWD/graphs:/var/otp/graphs \
  -e JAVA_OPTIONS=-Xmx4G \
- ikespand/otp --build \
+ urbica/otp --build \
  --save /var/otp/graphs/portland
 ```
 
@@ -82,7 +67,7 @@ docker run \
   -p 8080:8080 \
   -v $PWD/graphs:/var/otp/graphs \
   -e JAVA_OPTIONS=-Xmx4G \
-  ikespand/otp --load /var/otp/graphs/portland
+  urbica/otp --load /var/otp/graphs/portland
 ```
 
 Alternatively, modify the `docker-compose.yml` and then execute:
diff --git a/docker-compose.yml b/docker-compose.yml
index 51873d1..0c4519d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.0'
 
 services:
   otp:
-    image: ikespand/otp
+    image: urbica/otp
     restart: unless-stopped
     ports:
       - 8080:8080

From f65feb0d02d0f3413aad22188a173e285485bf30 Mon Sep 17 00:00:00 2001
From: Tariq Baig-Meininghaus <tariq.baig@ds.mpg.de>
Date: Wed, 13 Apr 2022 17:43:58 +0200
Subject: [PATCH 4/4] chened used base image to openjdk11:alpine

---
 Dockerfile         | 2 +-
 docker-compose.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 837d3c3..3d016d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM java11-alpine:11.0
+FROM adoptopenjdk/openjdk11:jre-11.0.13_8-alpine
 LABEL authors="Stepan Kuzmin <to.stepan.kuzmin@gmail.com>, Sandeep Pandey <spandey.ike@gmail.com, Tariq Baig-Meininghaus tarbaig@gmail.com"
 
 ENV OTP_VERSION=2.0.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 0c4519d..9a26ea3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2.0'
 
 services:
   otp:
-    image: urbica/otp
+    image:  urbica/otp
     restart: unless-stopped
     ports:
       - 8080:8080
@@ -12,6 +12,6 @@ services:
       - JAVA_OPTIONS=-Xmx2G
     command:
       [
-        '--load /var/otp/graphs/stuttgart',
+        '--load /var/otp/graphs/portland',
         '--maxThreads 4'
       ]