From 11a1360bf94d3d49825423e9193afbef6b63d465 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Tue, 30 Jul 2024 16:37:41 +0300
Subject: [PATCH 1/7] Add initial jib setup

---
 .github/workflows/dev-pipeline.yml | 34 ++++++++++++++-------
 pom.xml                            | 48 ++++++++++++++++++++++++++++++
 src/main/jib/docker-entrypoint.sh  |  3 ++
 3 files changed, 75 insertions(+), 10 deletions(-)
 create mode 100755 src/main/jib/docker-entrypoint.sh

diff --git a/.github/workflows/dev-pipeline.yml b/.github/workflows/dev-pipeline.yml
index 9bf5d0c24a9..b2a59f82848 100644
--- a/.github/workflows/dev-pipeline.yml
+++ b/.github/workflows/dev-pipeline.yml
@@ -3,18 +3,32 @@ on:
   push:
     branches:
       - dev-1.x
-  pull_request:
-    branches:
-      - dev-1.x
+      - jib-refactor-otp1
 jobs:
   docker-push:
-    if: github.ref == 'refs/heads/dev-1.x'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Build docker image from dev-1.x and push it
-        run: ./.github/workflows/scripts/build_and_push_dev.sh
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up JDK 8
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: adopt
+          cache: maven
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Build container image with Jib, push to Dockerhub
         env:
-          DOCKER_USER: ${{ secrets.DOCKER_USER }}
-          DOCKER_AUTH: ${{ secrets.DOCKER_AUTH }}
+          CONTAINER_REPO: docker.io/hsldevcom/opentripplanner:jib-testing-v1
+          CONTAINER_REGISTRY_USER: ${{ secrets.DOCKER_USER }}
+          CONTAINER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_AUTH }}
+        run: |
+          otp_version="jib-testing-v1"
+          commit_hash=`git rev-parse --short "$GITHUB_SHA"`
+          date_time=`date +"%Y-%m-%dT%H-%M-%S"`
+          docker_tag_long="$otp_version-$date_time-$commit_hash"
+
+          mvn --batch-mode -P prettierSkip compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=$docker_tag_long
diff --git a/pom.xml b/pom.xml
index 1cc7c32f1c9..fc60b17b802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,54 @@
                     <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <version>3.4.3</version>
+                <configuration>
+                    <container>
+                        <mainClass>org.opentripplanner.standalone.OTPMain</mainClass>
+                        <entrypoint>/docker-entrypoint.sh</entrypoint>
+                        <volumes>
+                            <volume>
+                                /var/opentripplanner/
+                            </volume>
+                        </volumes>
+                        <ports>
+                            <port>8080</port>
+                            <port>8081</port>
+                        </ports>
+                    </container>
+                    <from>
+                        <image>openjdk:8u121-jre</image>
+                        <platforms>
+                            <platform>
+                                <architecture>amd64</architecture>
+                                <os>linux</os>
+                            </platform>
+                        </platforms>
+                    </from>
+                    <to>
+                        <image>${env.CONTAINER_REPO}</image>
+                        <auth>
+                            <username>${env.CONTAINER_REGISTRY_USER}</username>
+                            <password>${env.CONTAINER_REGISTRY_PASSWORD}</password>
+                        </auth>
+                    </to>
+                    <extraDirectories>
+                        <permissions>
+                            <permission>
+                                <file>/docker-entrypoint.sh</file>
+                                <mode>755</mode>
+                            </permission>
+                            <permission>
+                                <file>/var/opentripplanner/</file>
+                                <mode>755</mode>
+                            </permission>
+                        </permissions>
+                    </extraDirectories>
+                </configuration>
+            </plugin>
 
             <!-- There used to be a dependency-plugin:copy-dependencies plugin entry
               here, but the shade-plugin will explode the dependencies even if they aren't
diff --git a/src/main/jib/docker-entrypoint.sh b/src/main/jib/docker-entrypoint.sh
new file mode 100755
index 00000000000..bc92c07b5df
--- /dev/null
+++ b/src/main/jib/docker-entrypoint.sh
@@ -0,0 +1,3 @@
+#! /bin/bash
+
+java $JAVA_OPTS -cp @/app/jib-classpath-file @/app/jib-main-class-file /var/opentripplanner/ $@

From 8c898f0a6bdc133dad80a7fffe1e2729caff8e8f Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Tue, 30 Jul 2024 20:43:05 +0300
Subject: [PATCH 2/7] Fix entrypoint

---
 src/main/jib/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/jib/docker-entrypoint.sh b/src/main/jib/docker-entrypoint.sh
index bc92c07b5df..93413cd19da 100755
--- a/src/main/jib/docker-entrypoint.sh
+++ b/src/main/jib/docker-entrypoint.sh
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-java $JAVA_OPTS -cp @/app/jib-classpath-file @/app/jib-main-class-file /var/opentripplanner/ $@
+java $JAVA_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) /var/opentripplanner/ $@

From 25332151f9930adfdd18dcfd1e8e64e3c2dcf3cb Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Tue, 30 Jul 2024 20:53:39 +0300
Subject: [PATCH 3/7] Slightly adjust entrypoint

---
 src/main/jib/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/jib/docker-entrypoint.sh b/src/main/jib/docker-entrypoint.sh
index 93413cd19da..32f3f055fdb 100755
--- a/src/main/jib/docker-entrypoint.sh
+++ b/src/main/jib/docker-entrypoint.sh
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-java $JAVA_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) /var/opentripplanner/ $@
+java $JAVA_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) $@

From 26aff2367398bf9f3d869b653828966b152416e3 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Fri, 2 Aug 2024 20:46:01 +0300
Subject: [PATCH 4/7] Use v1 tag in dev

---
 .github/workflows/dev-pipeline.yml | 5 ++---
 otp-ui                             | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100755 otp-ui

diff --git a/.github/workflows/dev-pipeline.yml b/.github/workflows/dev-pipeline.yml
index b2a59f82848..24a2c376764 100644
--- a/.github/workflows/dev-pipeline.yml
+++ b/.github/workflows/dev-pipeline.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - dev-1.x
-      - jib-refactor-otp1
 jobs:
   docker-push:
     runs-on: ubuntu-latest
@@ -22,11 +21,11 @@ jobs:
           node-version: 18
       - name: Build container image with Jib, push to Dockerhub
         env:
-          CONTAINER_REPO: docker.io/hsldevcom/opentripplanner:jib-testing-v1
+          CONTAINER_REPO: docker.io/hsldevcom/opentripplanner:v1
           CONTAINER_REGISTRY_USER: ${{ secrets.DOCKER_USER }}
           CONTAINER_REGISTRY_PASSWORD: ${{ secrets.DOCKER_AUTH }}
         run: |
-          otp_version="jib-testing-v1"
+          otp_version="v1"
           commit_hash=`git rev-parse --short "$GITHUB_SHA"`
           date_time=`date +"%Y-%m-%dT%H-%M-%S"`
           docker_tag_long="$otp_version-$date_time-$commit_hash"
diff --git a/otp-ui b/otp-ui
new file mode 100755
index 00000000000..23881a1385e
--- /dev/null
+++ b/otp-ui
@@ -0,0 +1,9 @@
+#!/bin/bash
+# Start the OTP interactive launcher which let you select datasource and OTP arguments before
+# starting OTP standalone. The `otp-ui` creates a file in the current directory
+
+JAR_FILE="$(dirname $0)/target/otp-2.6.0-SNAPSHOT-shaded.jar"
+MAIN_CLASS=org.opentripplanner.ext.interactivelauncher.InteractiveOtpMain
+
+echo "Stat OTP Interactive User Interface"
+java -Xmx8G -cp ${JAR_FILE} ${MAIN_CLASS} "$@"

From f6224b38db68a218e8df4caf89e4b650764c2ff1 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Fri, 2 Aug 2024 20:46:56 +0300
Subject: [PATCH 5/7] Use v1-prod tag for prod

---
 .github/workflows/scripts/push_prod.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/push_prod.sh b/.github/workflows/scripts/push_prod.sh
index f2eaacde776..4ae53ebfdc3 100755
--- a/.github/workflows/scripts/push_prod.sh
+++ b/.github/workflows/scripts/push_prod.sh
@@ -2,14 +2,14 @@
 set -e
 
 DOCKER_IMAGE="hsldevcom/opentripplanner"
-DOCKER_TAG="prod"
+DOCKER_TAG="v1-prod"
 
 COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
 
 DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH
 DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG
 DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG
-DOCKER_IMAGE_LATEST=$DOCKER_IMAGE:latest
+DOCKER_IMAGE_LATEST=$DOCKER_IMAGE:v1
 
 docker login -u $DOCKER_USER -p $DOCKER_AUTH
 

From 3b0caeea51f01c923ab2040dfb22528cf7715146 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Fri, 2 Aug 2024 20:48:13 +0300
Subject: [PATCH 6/7] Remove no longer needed files

---
 .../workflows/scripts/build_and_push_dev.sh   |  25 ----
 Dockerfile                                    |  23 ----
 Dockerfile.builder                            |  15 ---
 run.sh                                        | 107 ------------------
 4 files changed, 170 deletions(-)
 delete mode 100755 .github/workflows/scripts/build_and_push_dev.sh
 delete mode 100644 Dockerfile
 delete mode 100644 Dockerfile.builder
 delete mode 100755 run.sh

diff --git a/.github/workflows/scripts/build_and_push_dev.sh b/.github/workflows/scripts/build_and_push_dev.sh
deleted file mode 100755
index 85c0eb6d517..00000000000
--- a/.github/workflows/scripts/build_and_push_dev.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-set -e
-
-DOCKER_IMAGE="hsldevcom/opentripplanner"
-DOCKER_TAG="latest"
-
-COMMIT_HASH=$(git rev-parse --short "$GITHUB_SHA")
-
-DOCKER_TAG_LONG=$DOCKER_TAG-$(date +"%Y-%m-%dT%H.%M.%S")-$COMMIT_HASH
-DOCKER_IMAGE_TAG=$DOCKER_IMAGE:$DOCKER_TAG
-DOCKER_IMAGE_TAG_LONG=$DOCKER_IMAGE:$DOCKER_TAG_LONG
-
-# Build image
-echo Building OTP
-docker build --tag="$DOCKER_IMAGE:builder" -f Dockerfile.builder .
-docker run --rm --entrypoint tar "$DOCKER_IMAGE:builder" -c target|tar x -C ./
-docker build --tag="$DOCKER_IMAGE_TAG_LONG" -f Dockerfile .
-
-docker login -u $DOCKER_USER -p $DOCKER_AUTH
-echo "Pushing $DOCKER_TAG image"
-docker push $DOCKER_IMAGE_TAG_LONG
-docker tag $DOCKER_IMAGE_TAG_LONG $DOCKER_IMAGE_TAG
-docker push $DOCKER_IMAGE_TAG
-
-echo Build completed
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 90ef4c9c7a0..00000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM openjdk:8u121-jre-alpine
-MAINTAINER Reittiopas version: 0.1
-
-RUN apk add --update curl bash ttf-dejavu && \
-    rm -rf /var/cache/apk/*
-VOLUME /opt/opentripplanner/graphs
-
-ENV OTP_ROOT="/opt/opentripplanner"
-ENV ROUTER_DATA_CONTAINER_URL="https://api.digitransit.fi/routing-data/v2/finland"
-
-WORKDIR ${OTP_ROOT}
-
-ADD run.sh ${OTP_ROOT}/run.sh
-ADD target/*-shaded.jar ${OTP_ROOT}/otp-shaded.jar
-
-ENV PORT=8080
-EXPOSE ${PORT}
-ENV SECURE_PORT=8081
-EXPOSE ${SECURE_PORT}
-ENV ROUTER_NAME=finland
-ENV JAVA_OPTS="-Xms8G -Xmx8G"
-
-ENTRYPOINT exec ./run.sh
diff --git a/Dockerfile.builder b/Dockerfile.builder
deleted file mode 100644
index 9f5cfec10fa..00000000000
--- a/Dockerfile.builder
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM maven:3-jdk-8
-MAINTAINER Reittiopas version: 0.1
-
-RUN apt-get update && apt-get -y install curl
-
-ENV OTP_ROOT="/opt/opentripplanner"
-
-WORKDIR ${OTP_ROOT}
-
-ADD pom.xml ${OTP_ROOT}/pom.xml
-ADD src ${OTP_ROOT}/src
-add .git ${OTP_ROOT}/.git
-
-# Build OTP
-RUN mvn package
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 6de9c45880c..00000000000
--- a/run.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-# Fail fast if graph building fails
-set -e
-
-JAR=`ls *-shaded*`
-echo JAR=$JAR
-SLEEP_TIME=5
-
-#Parse data container URL(s) to a bash array
-IFS=',' read -r -a ROUTER_DATA_CONTAINER_URLS <<< $ROUTER_DATA_CONTAINER_URL
-
-#Parse router name(s) to a bash array
-IFS=',' read -r -a ROUTER_NAMES <<< $ROUTER_NAME
-
-ROUTERS=$(printf " --router %s" ${ROUTER_NAMES[@]})
-
-function url {
-  echo "${ROUTER_DATA_CONTAINER_URLS[$1]}"/$2
-}
-
-function build_graph {
-  GRAPHNAME=$1
-  FILE=$2
-  echo "building graph..."
-  DIR="graphs"
-  rm -rf $DIR/$GRAPHNAME || true
-  mkdir -p $DIR
-  unzip -o -d $DIR $FILE
-  mv $DIR/router-$GRAPHNAME $DIR/$GRAPHNAME
-  java $JAVA_OPTS -jar $JAR --build $DIR/$GRAPHNAME
-}
-
-function download_graph {
-  NAME=$1
-  VERSION=$2
-  GRAPH_FILE=graph-$NAME.zip
-  URL=$(url $3 "graph-$NAME-$VERSION.zip")
-  echo "Downloading graph from $URL"
-  for i in {1..6}; do
-    HTTP_STATUS=$(curl --write-out %{http_code} --silent --output $GRAPH_FILE $URL)
-
-    if [ "$HTTP_STATUS" -eq 404 ]; then
-        rm  $GRAPH_FILE > /dev/null
-        echo "Graph not found";
-       return 1;
-    fi
-
-    if [ "$HTTP_STATUS" -eq 200 ]; then break;
-    fi;
-
-    rm  $GRAPH_FILE > /dev/null
-    sleep $SLEEP_TIME;
-
-  done
-
-  if [ -f graph-$NAME.zip ]; then
-    # if the graph already exists then overwrite it, otherwise we need to build a new one on every start
-    unzip -o $GRAPH_FILE  -d ./graphs
-    return $?;
-  else
-    return 1;
-  fi
-}
-
-function version {
-  java -jar $JAR --version|grep commit|cut -d' ' -f2
-}
-
-function process {
-  NAME=$1
-  URL=$(url $2 "router-$NAME.zip")
-  FILE="$NAME.zip"
-
-  echo "Retrieving graph source bundle from $URL"
-  until curl -f -s $URL -o $FILE
-  do
-    echo "Error retrieving graph source bundle $URL from otp-data-server... retrying in $SLEEP_TIME s..."
-    sleep $SLEEP_TIME
-  done
-
-  build_graph $NAME $FILE
-}
-
-#workaround for azure DNS issue
-
-if [ -n "$MESOS_CONTAINER_NAME"  ]; then 
-  echo "search marathon.l4lb.thisdcos.directory" >> /etc/resolv.conf
-fi
-
-VERSION=$(version)
-
-echo VERSION $VERSION
-
-j="0"
-
-for ROUTER in "${ROUTER_NAMES[@]}"
-do
-  echo ROUTER $ROUTER
-
-  download_graph $ROUTER $VERSION "$j" || process $ROUTER "$j"
-
-  echo "graphString is: $ROUTER"
-  j=$[$j+1]
-done
-
-java -Dsentry.release=$VERSION $JAVA_OPTS -Duser.timezone=Europe/Helsinki -jar $JAR --server --port $PORT --securePort $SECURE_PORT --basePath ./ --graphs ./graphs $ROUTERS

From dd5aea19049d699606c441d9255ae66c983671bc Mon Sep 17 00:00:00 2001
From: Joel Lappalainen <lappalj8@gmail.com>
Date: Fri, 2 Aug 2024 20:50:53 +0300
Subject: [PATCH 7/7] Remove file which was added by mistake

---
 otp-ui | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100755 otp-ui

diff --git a/otp-ui b/otp-ui
deleted file mode 100755
index 23881a1385e..00000000000
--- a/otp-ui
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Start the OTP interactive launcher which let you select datasource and OTP arguments before
-# starting OTP standalone. The `otp-ui` creates a file in the current directory
-
-JAR_FILE="$(dirname $0)/target/otp-2.6.0-SNAPSHOT-shaded.jar"
-MAIN_CLASS=org.opentripplanner.ext.interactivelauncher.InteractiveOtpMain
-
-echo "Stat OTP Interactive User Interface"
-java -Xmx8G -cp ${JAR_FILE} ${MAIN_CLASS} "$@"