add graph build docker compose

Author: miles-grant-ibigroup

otp-docker/otp-graph-build-compose.yml

@@ -0,0 +1,35 @@
+version: '3.8'
+services:
+  download-bundle:
+    image: amazon/aws-cli
+    command: "s3 cp ${S3_URI} /var/opentripplanner/ --recursive"
+    volumes:
+      - type: bind
+        source: ./otp
+        target: /var/opentripplanner
+  #      - type: bind
+  #        source: ~/.aws
+  #        target: /root/.aws
+  otp-graph-build:
+    depends_on:
+      download-bundle:
+        condition: service_completed_successfully
+    image: alpine:latest
+    command: "apk add --no-cache nodejs yarn && yarn global add https://github.com/ibi-group/otp-runner.git && otp-runner /var/opentripplanner/"
+    volumes:
+      - type: bind
+        source: ./otp
+        target: /var/opentripplanner
+      - type: bind
+        source: ./caddy/static
+        target: /usr/share/nginx/client/
+  caddy:
+    image: caddy:latest
+    restart: unless-stopped
+    volumes:
+      - type: bind
+        source: ./caddy
+        target: /etc/caddy/
+    ports:
+      - "80:80"
+      - "443:443"

src/main/java/com/conveyal/datatools/manager/jobs/DeployJob.java

@@ -1387,7 +1387,7 @@ public String constructUserData(boolean graphAlreadyBuilt, boolean docker) {
         );
 
         List<String> lines = new ArrayList<>();
-        if (graphAlreadyBuilt && docker) {
+        if (docker) {
           lines.add("#!/bin/sh");
           lines.add("yum update -y");
           lines.add("yum install git -y");
@@ -1407,7 +1407,12 @@ public String constructUserData(boolean graphAlreadyBuilt, boolean docker) {
           lines.add("mkdir /root/.aws");
 
           lines.add(String.format("echo S3_URI=%s >> /root/datatools-server/otp-docker/.env", joinToS3FolderUri()));
-          lines.add("docker-compose -f ./otp-compose.yml up");
+          if (graphAlreadyBuilt) {
+              lines.add("docker-compose -f ./otp-compose.yml up");
+          } else {
+              lines.add("docker-compose -f ./otp-graph-build-compose.yml up");
+          }
+
         } else {
             lines.add("#!/bin/bash");