From 394fd17dfa11c82ae61444d984c9e4cdea7cffb0 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 15 Oct 2018 11:06:18 +0100
Subject: [PATCH] Working docker setup

---
 services/git-bridge/Dockerfile         |  5 +++--
 services/git-bridge/Makefile           |  5 +++--
 services/git-bridge/docker-compose.yml | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 services/git-bridge/docker-compose.yml

diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index b3e8d97cfd..a8b16e79f2 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -5,11 +5,12 @@ FROM ubuntu:latest
 
 
 RUN apt-get update && \
-  apt-get install -y git make maven openjdk-8-jdk && \
+  apt-get install -y git make maven openjdk-8-jdk curl && \
   update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/bin/java 100 && \
   update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac 100 && \
   update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/bin/java && \
   update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
 
 
-RUN mkdir /app
\ No newline at end of file
+RUN mkdir /app
+WORKDIR /app
\ No newline at end of file
diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile
index 79bb308a86..18ec01588e 100644
--- a/services/git-bridge/Makefile
+++ b/services/git-bridge/Makefile
@@ -1,6 +1,7 @@
 # git-bridge makefile
 
-run:
+
+run: package
 	java -jar target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar conf/local.json
 
 
@@ -20,4 +21,4 @@ package:
 	mvn package
 
 
-.PHONY: build clean test
+.PHONY: run package build clean test
diff --git a/services/git-bridge/docker-compose.yml b/services/git-bridge/docker-compose.yml
new file mode 100644
index 0000000000..6efadb0e59
--- /dev/null
+++ b/services/git-bridge/docker-compose.yml
@@ -0,0 +1,17 @@
+version: "3"
+
+networks:
+  default:
+    external:
+      name: sharelatex_overleaf
+
+services:
+  git_bridge:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - .:/app
+    command: make run
+    ports:
+      - 8000:8000