From a00055af1311229dde3dfcf1fed8aa5c96c58c08 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 21 Dec 2024 17:45:35 +0100 Subject: [PATCH] update dockerfile-mode Signed-off-by: Andreas Gerler --- .../dockerfile-mode-pkg.el | 2 -- .../dockerfile-mode-autoloads.el | 34 +++++++++---------- .../dockerfile-mode-pkg.el | 8 +++++ .../dockerfile-mode.el | 30 ++++++++++------ elpa/dockerfile-mode-readme.txt | 3 -- 5 files changed, 44 insertions(+), 33 deletions(-) delete mode 100644 elpa/dockerfile-mode-20220822.2021/dockerfile-mode-pkg.el rename elpa/{dockerfile-mode-20220822.2021 => dockerfile-mode-20240914.1549}/dockerfile-mode-autoloads.el (73%) create mode 100644 elpa/dockerfile-mode-20240914.1549/dockerfile-mode-pkg.el rename elpa/{dockerfile-mode-20220822.2021 => dockerfile-mode-20240914.1549}/dockerfile-mode.el (92%) delete mode 100644 elpa/dockerfile-mode-readme.txt diff --git a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode-pkg.el b/elpa/dockerfile-mode-20220822.2021/dockerfile-mode-pkg.el deleted file mode 100644 index d3b2ea63..00000000 --- a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from dockerfile-mode.el -*- no-byte-compile: t -*- -(define-package "dockerfile-mode" "20220822.2021" "Major mode for editing Docker's Dockerfiles" '((emacs "24")) :commit "52c6c00da1d31c0b6c29c74335b3af63ed6bf06c" :keywords '("docker" "languages" "processes" "tools") :url "https://github.com/spotify/dockerfile-mode") diff --git a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode-autoloads.el b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode-autoloads.el similarity index 73% rename from elpa/dockerfile-mode-20220822.2021/dockerfile-mode-autoloads.el rename to elpa/dockerfile-mode-20240914.1549/dockerfile-mode-autoloads.el index af15e383..bade491d 100644 --- a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode-autoloads.el +++ b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode-autoloads.el @@ -1,13 +1,14 @@ -;;; dockerfile-mode-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; dockerfile-mode-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "dockerfile-mode" "dockerfile-mode.el" (0 0 -;;;;;; 0 0)) ;;; Generated autoloads from dockerfile-mode.el (autoload 'dockerfile-build-buffer "dockerfile-mode" "\ @@ -27,31 +28,30 @@ The shell command used to build the image is: -f filename \\ directory -\(fn IMAGE-NAME &optional NO-CACHE)" t nil) - +(fn IMAGE-NAME &optional NO-CACHE)" t) (autoload 'dockerfile-build-no-cache-buffer "dockerfile-mode" "\ Build an image called IMAGE-NAME based upon the buffer without cache. -\(fn IMAGE-NAME)" t nil) - +(fn IMAGE-NAME)" t) (autoload 'dockerfile-mode "dockerfile-mode" "\ A major mode to edit Dockerfiles. \\{dockerfile-mode-map} -\(fn)" t nil) - +(fn)" t) (add-to-list 'auto-mode-alist (cons (concat "[/\\]" "\\(?:Containerfile\\|Dockerfile\\)" "\\(?:\\.[^/\\]*\\)?\\'") 'dockerfile-mode)) - (add-to-list 'auto-mode-alist '("\\.dockerfile\\'" . dockerfile-mode)) - (register-definition-prefixes "dockerfile-mode" '("dockerfile-")) - -;;;*** +;;; End of scraped data + +(provide 'dockerfile-mode-autoloads) + ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; dockerfile-mode-autoloads.el ends here diff --git a/elpa/dockerfile-mode-20240914.1549/dockerfile-mode-pkg.el b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode-pkg.el new file mode 100644 index 00000000..9d8ef861 --- /dev/null +++ b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode-pkg.el @@ -0,0 +1,8 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "dockerfile-mode" "20240914.1549" + "Major mode for editing Docker's Dockerfiles." + '((emacs "24")) + :url "https://github.com/spotify/dockerfile-mode" + :commit "4d893bd2da15833ce056332e6c972d5d93e78f04" + :revdesc "4d893bd2da15" + :keywords '("docker" "languages" "processes" "tools")) diff --git a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode.el b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode.el similarity index 92% rename from elpa/dockerfile-mode-20220822.2021/dockerfile-mode.el rename to elpa/dockerfile-mode-20240914.1549/dockerfile-mode.el index 656e3d4d..10452956 100644 --- a/elpa/dockerfile-mode-20220822.2021/dockerfile-mode.el +++ b/elpa/dockerfile-mode-20240914.1549/dockerfile-mode.el @@ -2,11 +2,10 @@ ;; Copyright (c) 2013 Spotify AB ;; Package-Requires: ((emacs "24")) -;; Package-Version: 20220822.2021 -;; Package-Commit: 52c6c00da1d31c0b6c29c74335b3af63ed6bf06c ;; Homepage: https://github.com/spotify/dockerfile-mode ;; URL: https://github.com/spotify/dockerfile-mode -;; Version: 1.7 +;; Package-Version: 20240914.1549 +;; Package-Revision: 4d893bd2da15 ;; Keywords: docker languages processes tools ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -74,6 +73,17 @@ Each element of the list will be passed as a separate :group 'dockerfile :type 'string) +(defcustom dockerfile-build-extra-options nil + "Extra command-line options to send to docker build. + +Use this variable to add custom command-line switches not covered by +existing dockerfile-build-* variables. + +Example: +(setq-default dockerfile-build-extra-options \"--network host\")" + :group 'dockerfile + :type 'string) + (defcustom dockerfile-use-buildkit nil "Use Docker buildkit for building images? @@ -158,19 +168,16 @@ Lines beginning with a keyword are ignored, and any others are indented by one `dockerfile-indent-offset'. Functionality toggled by `dockerfile-enable-auto-indent'." (when dockerfile-enable-auto-indent - (unless (member (get-text-property (point-at-bol) 'face) + (unless (member (get-text-property (line-beginning-position) 'face) '(font-lock-comment-delimiter-face font-lock-keyword-face)) (save-excursion (beginning-of-line) - (skip-chars-forward "[ \t]" (point-at-eol)) - (unless (equal (point) (point-at-eol)) ; Ignore empty lines. - ;; Delete existing whitespace. - (delete-char (- (point-at-bol) (point))) - (indent-to dockerfile-indent-offset)))))) + (unless (looking-at-p "\\s-*$") ; Ignore empty lines. + (indent-line-to dockerfile-indent-offset)))))) (defun dockerfile-build-arg-string () "Create a --build-arg string for each element in `dockerfile-build-args'." - (mapconcat (lambda (arg) (concat "--build-arg " (shell-quote-argument arg))) + (mapconcat (lambda (arg) (concat "--build-arg=" (replace-regexp-in-string "\\\\=" "=" (shell-quote-argument arg)))) dockerfile-build-args " ")) (defun dockerfile-standard-filename (file) @@ -224,7 +231,7 @@ The shell command used to build the image is: (save-buffer) (compilation-start (format - "%s%s%s build %s %s %s %s %s --progress %s -f %s %s" + "%s%s%s build %s %s %s %s %s --progress %s %s -f %s %s" (if dockerfile-use-buildkit "DOCKER_BUILDKIT=1 " "") (if dockerfile-use-sudo "sudo " "") dockerfile-mode-command @@ -234,6 +241,7 @@ The shell command used to build the image is: (dockerfile-tag-string image-name) (dockerfile-build-arg-string) dockerfile-build-progress + (or dockerfile-build-extra-options "") (shell-quote-argument (dockerfile-standard-filename (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name)))) diff --git a/elpa/dockerfile-mode-readme.txt b/elpa/dockerfile-mode-readme.txt deleted file mode 100644 index 559075c7..00000000 --- a/elpa/dockerfile-mode-readme.txt +++ /dev/null @@ -1,3 +0,0 @@ -Provides a major mode `dockerfile-mode' for use with the standard -`Dockerfile' file format. Additional convenience functions allow -images to be built easily. -- 2.47.3