From eaaca2d462191b69db715ce972eb40736c94e2d0 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Tue, 28 Feb 2017 20:08:15 -0700 Subject: Adding local copy of vim-options to make building easier/not have to push to master to try new build --- .gitignore | 1 + Dockerfile | 2 ++ Makefile | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index ad883bd..b56f5b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ package .vimcache nvim +vim-options diff --git a/Dockerfile b/Dockerfile index 982f446..e1bf6e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,5 +93,7 @@ ADD nvim /root/.config/nvim # Install neovim Modules RUN nvim +PlugInstall +qall RUN nvim +UpdateRemotePlugins +qall +# Add local vim-options, can override the one inside +ADD vim-options /root/.config/nvim/plugged/vim-options # Add isort config, also changes often ADD isort.cfg /root/.isort.cfg diff --git a/Makefile b/Makefile index ca560ce..0248164 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,10 @@ IMAGENAME=thornycrackers/neovim help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' +setup: ## Clone down additional repos that are needed for building + git clone git@github.com:thornycrackers/.nvim.git nvim + git clone git@github.com:thornycrackers/vim-options.git + build: ## Build the base image docker build -t thornycrackers/shellcheck shellcheck-builder docker run --rm -it -v $(CURDIR):/mnt thornycrackers/shellcheck -- cgit v1.2.3