From dffee6f31c9fdadfd69e247df7fc065b1619e8da Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 12 May 2017 21:49:55 +0200
Subject: [PATCH] Provide an image with default Vims (including Neovim)

Fixes https://github.com/tweekmonster/vim-testbed/issues/27.
---
 Dockerfile.default | 16 ++++++++++++++++
 Makefile           | 13 ++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile.default

diff --git a/Dockerfile.default b/Dockerfile.default
new file mode 100644
index 0000000..c013eb9
--- /dev/null
+++ b/Dockerfile.default
@@ -0,0 +1,16 @@
+# A set of default Vims, including the latest Neovim release.
+#
+# This is available online at https://hub.docker.com/r/testbed/vim-default/.
+FROM testbed/vim
+
+# Currently tested versions:
+#  - v7.3.429 (Ubuntu Precise, 12.04LTS; same as on Travis currently)
+#  - v7.4.052 (Ubuntu Trusty, 14.04LTS)
+#  - v7.4.1689 (Ubuntu Xenial, 16.04LTS)
+#  - v8.1.0000 (Stable release according to Windows download at
+#               http://www.vim.org/download.php)
+RUN install_vim -tag v7.3.429 -name vim73 -py -build \
+                -tag v7.4.052 -name vim74-trusty -build \
+                -tag v7.4.1689 -name vim74-xenial -build \
+                -tag v8.1.0000 -name vim -py2 -py3 -build \
+                -tag neovim:v0.3.1 -name nvim -py2 -py3 -build
diff --git a/Makefile b/Makefile
index cc4cb31..15581f1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 .PHONY: build push test
 
+DOCKER_REPO_BASE:=testbed/vim
+DOCKER_REPO_VIMS_DEFAULT:=testbed/vim-default
+
 TAG:=11
 
 build:
-	docker build -t testbed/vim:$(TAG) .
-
+	docker build -t $(DOCKER_REPO_BASE):$(TAG) .
 push:
-	docker push testbed/vim:$(TAG)
+	docker push $(DOCKER_REPO_BASE):$(TAG)
+
+build_default:
+	docker build -f Dockerfile.default -t $(DOCKER_REPO_VIMS_DEFAULT) .
+push_default:
+	docker push $(DOCKER_REPO_VIMS_DEFAULT)
 
 update_latest:
 	docker tag testbed/vim:$(TAG) testbed/vim:latest