diff --git a/gj_common/Dockerfile b/gj_common/Dockerfile
index eccda614..a05f3a35 100644
--- a/gj_common/Dockerfile
+++ b/gj_common/Dockerfile
@@ -1,9 +1,5 @@
-FROM ubuntu:latest
+FROM alpine:latest
 
-RUN apt-get update
-RUN apt-get install -y build-essential libssl-dev autoconf git gettext
-RUN apt-get install -y zlib1g-dev vim
-RUN apt-get install -y clang cmake
-
-COPY ./build-libgit2.sh /
-RUN ./build-libgit2.sh
+RUN apk update
+RUN apk add clang libgit2-dev
+RUN apk add bash make libc-dev g++ vim
diff --git a/gj_common/Makefile b/gj_common/Makefile
index b26bd85e..b9e82d90 100644
--- a/gj_common/Makefile
+++ b/gj_common/Makefile
@@ -2,3 +2,9 @@ CC=clang
 
 test: gitjournal.c test.c keygen.c common.c
 	$(CC) -o test -g test.c common.c gitjournal.c keygen.c -lgit2 -lssl -lcrypto
+
+build-env: Dockerfile
+	docker build -t gitjournal_lib .
+
+shell:
+	docker run --rm -it -v `pwd`:/code -w /code gitjournal_lib bash