Skip to content

Commit

Permalink
docker: update
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed Feb 23, 2018
1 parent 45af88d commit 90268f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2

common: &common
docker:
- image: neomake/vims-for-tests:20@sha256:14859f9e4b73e13c716ac85dd05edb4dbd451e4870fc210a0529f6f603eaa3ee
- image: neomake/vims-for-tests:21@sha256:81b090c042e3d39a8d6e64f2698fc9cc84ec6ebf6aed3b74a7be03c5894a3e4a
working_directory: ~/repo
steps:
- checkout
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.tests
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# From https://github.com/tweekmonster/vim-testbed.
FROM testbed/vim:9@sha256:dc14380bb3d6a87790e4b6d4fc696a369258bd86b4a597dbe73c174cb7f0f5a8
FROM testbed/vim:10@sha256:be6e7e3b7b424671da955ccc71a980f329ec10b773cbae001e696429148ed391

# Currently tested versions:
# - v7.3.429 (Ubuntu Precise, 12.04LTS)
Expand All @@ -17,7 +17,7 @@ RUN install_vim -tag v7.3.429 -name vim73 --with-features=huge -build \
-tag neovim:v0.2.2 -py3 -build \
&& rm -rf /vim-build/vim/vim/*/share/vim/*/tutor

ENV NEOMAKE_DOCKERFILE_UPDATE=2018-02-13
ENV NEOMAKE_DOCKERFILE_UPDATE=2018-02-20

# Git master in a separate layer, since the above is meant to be stable.
RUN install_vim -tag master -build \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ vimhelplint: | $(if $(VIMHELPLINT_DIR),,build/vimhelplint)

# Run tests in dockerized Vims.
DOCKER_REPO:=neomake/vims-for-tests
DOCKER_TAG:=20
DOCKER_TAG:=21
NEOMAKE_DOCKER_IMAGE?=
DOCKER_IMAGE:=$(if $(NEOMAKE_DOCKER_IMAGE),$(NEOMAKE_DOCKER_IMAGE),$(DOCKER_REPO):$(DOCKER_TAG))
DOCKER_STREAMS:=-ti
Expand Down

0 comments on commit 90268f1

Please sign in to comment.