diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5a90293
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:10
+
+COPY target/docker/tileserver.jar /
+
+CMD ["java", "-jar", "/tileserver.jar"]
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7ad4b47
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,11 @@
+
+TAG=registry.rudin.io/x86/minetest-tileserver
+VOLUMES=-v maven-repo:/root/.m2 -v $(shell pwd)/src:/src -v $(shell pwd)/pom.xml:/pom.xml -v $(shell pwd)/target/docker:/target
+
+build:
+	rm -rf target/docker
+	docker run -it --rm $(VOLUMES) maven:3.5-jdk-10 mvn install
+	docker build . -t $(TAG)
+
+push:
+	docker push $(TAG)