aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCody Hiar <codyfh@gmail.com>2017-02-28 20:08:15 -0700
committerCody Hiar <codyfh@gmail.com>2017-02-28 20:08:15 -0700
commiteaaca2d462191b69db715ce972eb40736c94e2d0 (patch)
tree0b28582c6d12929c665cbbbf9b88813212ce9ee8
parent6aa1341521deca318f6bb6171fec930632129916 (diff)
Adding local copy of vim-options to make building easier/not have to
push to master to try new build
-rw-r--r--.gitignore1
-rw-r--r--Dockerfile2
-rw-r--r--Makefile4
3 files changed, 7 insertions, 0 deletions
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