diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..243fb61
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+ARG IMAGE=fedora
+ARG IMAGE_TAG=29
+
+FROM ${IMAGE}:${IMAGE_TAG}
+
+LABEL com.hashbangbash.image=${IMAGE}:${IMAGE_TAG}@${DIGEST}
+LABEL com.hashbangbash.image.repo=${IMAGE}
+LABEL com.hashbangbash.image.tag=${IMAGE_TAG}
+LABEL com.hashbangbash.image.digest=${DIGEST}
+
+RUN dnf update -y --refresh && \
+    dnf install -y bip && \
+    dnf clean all
+RUN sed -i 's/^#ip/ip/' /etc/bip.conf && \
+    sed -i 's/^#port/port/' /etc/bip.conf
+
+VOLUME /var/run/bip
+USER bip
+EXPOSE 7778
+ENV HOME=/var/run/bip
+CMD ["/usr/bin/bip", "-n", "-f", "/etc/bip.conf"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..e5ac5b8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,19 @@
+OUTPUT	?= $(USER)/bip
+CTR	?= podman
+IMAGE	?= fedora
+TAG	?= 29
+
+.PHONY: image
+image: .digest
+	$(CTR) build \
+		--build-arg "IMAGE=$(IMAGE)" \
+		--build-arg "IMAGE_TAG=$(TAG)" \
+		--build-arg "DIGEST=$(shell cat .digest)" \
+		-t $(OUTPUT) \
+		.
+
+pull:
+	$(CTR) pull $(IMAGE):$(TAG)
+
+.digest: pull
+	$(CTR) images --digests --format "{{.Digest}}" $(IMAGE):$(TAG) | head -1 | tee $@