From e8476db31cb104f6aed351dd3f213a849d350dd3 Mon Sep 17 00:00:00 2001 From: Cody Hiar Date: Thu, 21 Sep 2017 14:41:14 -0600 Subject: Stupid fucking thing --- Dockerfile | 8 ++++---- isort.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3970dc6..e49efa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,6 +33,7 @@ ENV LC_ALL en_US.UTF-8 # Install PHP 5.6/Neovim RUN add-apt-repository ppa:ondrej/php RUN add-apt-repository ppa:neovim-ppa/stable + # Install custom packages RUN apt-get update && apt-get install -y \ php5.6 \ @@ -82,12 +83,11 @@ WORKDIR /root/app RUN infocmp $TERM | sed 's/kbs=^[hH]/kbs=\\177/' > /tmp/$TERM.ti RUN tic /tmp/$TERM.ti # Command for the image -CMD ["/bin/bash"] -# Add nvim config. Put this last since it changes often ADD nvim /root/.config/nvim +RUN curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim # Install neovim Modules -RUN nvim -i NONE -c PlugInstall -c quitall > /dev/null 2>&1 -RUN nvim -i NONE -c UpdateRemotePlugins -c quitall > /dev/null 2>&1 +RUN nvim -c PlugInstall -c quitall +RUN nvim -c UpdateRemotePlugins -c quitall # Add flake8 config, don't trigger a long build process ADD flake8 /root/.flake8 # Add local vim-options, can override the one inside diff --git a/isort.cfg b/isort.cfg index e06ca37..8af24bf 100644 --- a/isort.cfg +++ b/isort.cfg @@ -8,4 +8,4 @@ default_section=FIRSTPARTY skip=migrations include_trailing_comma=True # Because neovim runs in separate container, explicitly calling out third parties is needed -known_third_party=pdfcrowd,PyPDF2,pytest,mock,model_mommy,adminactions,private_storage,wagtail,modelcluster,django_extensions,localflavor,post_office,paypal,djangocms_link,peewee,ccxt +known_third_party=pdfcrowd,PyPDF2,pytest,mock,model_mommy,adminactions,private_storage,wagtail,modelcluster,django_extensions,localflavor,post_office,paypal,djangocms_link,peewee,ccxt,openpyxl -- cgit v1.2.3