branch: elpa/dockerfile-mode commit c462ba865052ad95bceaf5aea38f60bc99a4550c Merge: 58179938b2 7f92c17b99 Author: Drew Csillag <d...@thecsillags.com> Commit: Drew Csillag <d...@thecsillags.com>
Merge pull request #1 from thomasf/master sudo defcustom + auto-mode regexp in README. --- README.md | 2 +- dockerfile-mode.el | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 87e160d2a8..52db15d50c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A Dockerfile mode for emacs (add-to-list 'load-path "/your/path/to/dockerfile-mode/") (require 'dockerfile-mode) - (add-to-list 'auto-mode-alist '("Dockerfile" . dockerfile-mode)) + (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)) Adds syntax highlighting as well as the ability to build the image directly (C-c C-b) from the buffer. diff --git a/dockerfile-mode.el b/dockerfile-mode.el index 8e58a5daed..58c2e4e40d 100644 --- a/dockerfile-mode.el +++ b/dockerfile-mode.el @@ -27,6 +27,9 @@ :type 'hook :group 'dockerfile) +(defcustom dockerfile-use-sudo nil + "Runs docker builder command with sudo.") + (defvar dockerfile-mode-syntax-table nil "Syntax table used while in `dockerfile-mode'.") (setq dockerfile-mode-syntax-table (make-syntax-table)) @@ -73,7 +76,7 @@ (save-buffer) (if (stringp image-name) (shell-command - (concat "docker build -t " image-name " " (file-name-directory (buffer-file-name)) "&") + (concat (if dockerfile-use-sudo "sudo " "") "docker build -t " image-name " " (file-name-directory (buffer-file-name)) "&") "*docker-build-output*") (print "docker-image-name must be a string, consider surrounding it with double quotes")))