diff --git a/services/git-bridge/.gitignore b/services/git-bridge/.gitignore
index 43696eb643..ddd7ab399f 100644
--- a/services/git-bridge/.gitignore
+++ b/services/git-bridge/.gitignore
@@ -1,6 +1,8 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+conf/local.json
+
 # Let's not share anything because we're using Maven.
 
 .idea
diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
new file mode 100644
index 0000000000..1c4e35bfeb
--- /dev/null
+++ b/services/git-bridge/Dockerfile
@@ -0,0 +1,15 @@
+# Dockerfile for git-bridge
+
+
+FROM ubuntu:latest
+
+
+RUN apt-get update && \
+  apt-get install -y make maven openjdk-8-jdk && \
+  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
diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile
new file mode 100644
index 0000000000..f27d9f156e
--- /dev/null
+++ b/services/git-bridge/Makefile
@@ -0,0 +1,23 @@
+# git-bridge makefile
+
+run: package
+	java -jar target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar config/local.json
+
+
+build:
+	mvn package
+
+
+test:
+	mvn test
+
+
+clean:
+	mvn clean
+
+
+package:
+	mvn package
+
+
+.PHONY: build clean test