Skip to content

Commit 42357af

Browse files
authored
Move to testbed/vim Docker repo (#18)
This also adds a separate Dockerfile for the tests, making the example work by itself. Ref: https://hub.docker.com/r/testbed/vim/ Ref: #14
1 parent 68d7a4c commit 42357af

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
.PHONY: build test
1+
.PHONY: build push test
22

33
build:
4-
docker build -t "tweekmonster/vim-testbed" .
4+
docker build -t testbed/vim .
55

6-
# test: build the base image and then the example image on top, running tests
7-
# therein.
6+
push:
7+
docker push testbed/vim
8+
9+
# test: build the base image and example image on top, running tests therein.
810
DOCKER_BASE_IMAGE:=vim-testbed-base
911
DOCKER_EXAMPLE_IMAGE:=vim-testbed-example
1012
test:
1113
docker build -t "$(DOCKER_BASE_IMAGE)" . \
1214
&& cd example \
13-
&& docker build -t "$(DOCKER_EXAMPLE_IMAGE)" . \
15+
&& docker build -f Dockerfile.tests -t "$(DOCKER_EXAMPLE_IMAGE)" . \
1416
&& make test IMAGE=$(DOCKER_EXAMPLE_IMAGE)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Vim Testbed
22

33
[![Build Status](https://travis-ci.org/tweekmonster/vim-testbed.svg?branch=master)](https://travis-ci.org/tweekmonster/vim-testbed)
4-
[![](https://badge.imagelayers.io/tweekmonster/vim-testbed:latest.svg)](https://imagelayers.io/?images=tweekmonster/vim-testbed:latest)
4+
[![](https://badge.imagelayers.io/testbed/vim:latest.svg)](https://imagelayers.io/?images=testbed/vim:latest)
55

66
Because unit testing a Vim plugin is a pain in the ass.
77

@@ -29,7 +29,7 @@ your [Docker Hub](https://hub.docker.com/) repository.
2929
### Dockerfile
3030

3131
```Dockerfile
32-
FROM tweekmonster/vim-testbed:latest
32+
FROM testbed/vim:latest
3333

3434
RUN install_vim -tag v7.3 -name vim73 -build \
3535
-tag v7.4.052 -name vim74 -build \

example/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM vim-testbed-base
1+
FROM testbed/vim
22

33
RUN install_vim -name vim-precise -tag v7.3.429 -build \
44
-name vim-trusty -tag v7.4.052 -build \

example/Dockerfile.tests

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This Dockerfile is used for "make test" from the top level Makefile.
2+
FROM vim-testbed-base
3+
4+
RUN install_vim -name vim-precise -tag v7.3.429 -build \
5+
-name vim-trusty -tag v7.4.052 -build \
6+
-name vim-vivid -tag v7.4.488 -build \
7+
-name vim-wily -tag v7.4.712 -build \
8+
-name vim-xenial -tag v7.4.963 -build

0 commit comments

Comments
 (0)