diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..b972fe1c24
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ruby:2.5
+
+RUN gem install bundler jekyll
+
+WORKDIR /srv/jekyll
+
+COPY Gemfile .
+COPY Gemfile.lock .
+
+RUN bundle install
+
diff --git a/docker-compose.yml b/docker-compose.yml
index 26f6d5b398..bfc376a362 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
-version: '2'
-
+version: "2"
 services:
-  jekyll:
-    image: bretfisher/jekyll-serve
-    volumes:
-      - .:/site
+  scala-lang:
+    build: .
+    command: bundle exec jekyll serve --incremental --host=0.0.0.0
     ports:
-      - '8080:4000'
+      - 4000:4000
+    volumes:
+      - .:/srv/jekyll