From 4e8431f865947e639f67c5bc0ecf166be0120eb0 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Apr 2026 19:46:15 +0200 Subject: [PATCH] update dockerfile --- elpa/dockerfile-mode-20251221.1644/README-elpa | 3 +++ .../dockerfile-mode-autoloads.el | 16 +++++++++------- .../dockerfile-mode-pkg.el | 6 +++--- .../dockerfile-mode.el | 17 ++++++++++++----- 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 elpa/dockerfile-mode-20251221.1644/README-elpa rename elpa/{dockerfile-mode-20250315.1426 => dockerfile-mode-20251221.1644}/dockerfile-mode-autoloads.el (73%) rename elpa/{dockerfile-mode-20250315.1426 => dockerfile-mode-20251221.1644}/dockerfile-mode-pkg.el (63%) rename elpa/{dockerfile-mode-20250315.1426 => dockerfile-mode-20251221.1644}/dockerfile-mode.el (96%) diff --git a/elpa/dockerfile-mode-20251221.1644/README-elpa b/elpa/dockerfile-mode-20251221.1644/README-elpa new file mode 100644 index 00000000..559075c7 --- /dev/null +++ b/elpa/dockerfile-mode-20251221.1644/README-elpa @@ -0,0 +1,3 @@ +Provides a major mode `dockerfile-mode' for use with the standard +`Dockerfile' file format. Additional convenience functions allow +images to be built easily. diff --git a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode-autoloads.el b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode-autoloads.el similarity index 73% rename from elpa/dockerfile-mode-20250315.1426/dockerfile-mode-autoloads.el rename to elpa/dockerfile-mode-20251221.1644/dockerfile-mode-autoloads.el index bade491d..4a69ebc1 100644 --- a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode-autoloads.el +++ b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode-autoloads.el @@ -11,8 +11,8 @@ ;;; Generated autoloads from dockerfile-mode.el -(autoload 'dockerfile-build-buffer "dockerfile-mode" "\ -Build an image called IMAGE-NAME based upon the buffer. +(autoload 'dockerfile-build-buffer "dockerfile-mode" +"Build an image called IMAGE-NAME based upon the buffer. If the prefix arg NO-CACHE is set, don't cache the image. @@ -29,15 +29,17 @@ The shell command used to build the image is: directory (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. +(autoload 'dockerfile-build-no-cache-buffer "dockerfile-mode" +"Build an image called IMAGE-NAME based upon the buffer without cache. (fn IMAGE-NAME)" t) -(autoload 'dockerfile-mode "dockerfile-mode" "\ -A major mode to edit Dockerfiles. +(autoload 'dockerfile-mode "dockerfile-mode" +"A major mode to edit Dockerfiles. \\{dockerfile-mode-map} -(fn)" t) +In addition to any hooks its parent mode `prog-mode' might have run, +this mode runs the hook `dockerfile-mode-hook', as the final or +penultimate step during initialization." 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-")) diff --git a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode-pkg.el b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode-pkg.el similarity index 63% rename from elpa/dockerfile-mode-20250315.1426/dockerfile-mode-pkg.el rename to elpa/dockerfile-mode-20251221.1644/dockerfile-mode-pkg.el index 03546dbe..21540cc5 100644 --- a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode-pkg.el +++ b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode-pkg.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "dockerfile-mode" "20250315.1426" +(define-package "dockerfile-mode" "20251221.1644" "Major mode for editing Docker's Dockerfiles." '((emacs "24")) :url "https://github.com/spotify/dockerfile-mode" - :commit "8135740bfc6ad96ab82d39d9fe68dbce56180f4c" - :revdesc "8135740bfc6a" + :commit "97733ce074b1252c1270fd5e8a53d178b66668ed" + :revdesc "97733ce074b1" :keywords '("docker" "languages" "processes" "tools")) diff --git a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode.el b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode.el similarity index 96% rename from elpa/dockerfile-mode-20250315.1426/dockerfile-mode.el rename to elpa/dockerfile-mode-20251221.1644/dockerfile-mode.el index 49b58b66..ef5b6401 100644 --- a/elpa/dockerfile-mode-20250315.1426/dockerfile-mode.el +++ b/elpa/dockerfile-mode-20251221.1644/dockerfile-mode.el @@ -4,8 +4,8 @@ ;; Package-Requires: ((emacs "24")) ;; Homepage: https://github.com/spotify/dockerfile-mode ;; URL: https://github.com/spotify/dockerfile-mode -;; Package-Version: 20250315.1426 -;; Package-Revision: 8135740bfc6a +;; Package-Version: 20251221.1644 +;; Package-Revision: 97733ce074b1 ;; Keywords: docker languages processes tools ;; ;; Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -111,7 +111,14 @@ It is supported from docker 18.09" "Face to highlight the base image alias inf FROM ... AS construct.") (defconst dockerfile--from-regex - (rx "from " (group (+? nonl)) (or " " eol) (? "as " (group (1+ nonl))))) + (rx line-start (* blank) "from" (+ blank) + (? "--platform=" (+ (not (any blank "\n"))) (+ blank)) + (group (+ (not (any blank "\n")))) + (* blank) + (? "as" (+ blank) (group (+ (not (any blank "\n"))))) + (* blank) + (? "#" (* nonl)) + line-end)) (defvar dockerfile-font-lock-keywords `(,(cons (rx (or line-start "onbuild ") @@ -138,10 +145,10 @@ It is supported from docker 18.09" (define-key menu-map [dfc] '(menu-item "Comment Region" comment-region :help "Comment Region")) - (define-key menu-map [dfb] + (define-key-after menu-map [dfb] '(menu-item "Build" dockerfile-build-buffer :help "Send the Dockerfile to docker build")) - (define-key menu-map [dfb] + (define-key-after menu-map [dfbnc] '(menu-item "Build without cache" dockerfile-build-no-cache-buffer :help "Send the Dockerfile to docker build without cache")) map)) -- 2.47.3