diff --git a/.gitignore b/.gitignore index 047dea4..ae730b4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /emacs-dockerfile-mode-1.6.tar.gz /emacs-dockerfile-mode-1.7.tar.gz /emacs-dockerfile-mode-1.8.tar.gz +/emacs-dockerfile-mode-1.9.tar.gz diff --git a/dockerfile-mode-init.el b/dockerfile-mode-init.el index f10a929..126ba24 100644 --- a/dockerfile-mode-init.el +++ b/dockerfile-mode-init.el @@ -1,23 +1,35 @@ (autoload 'dockerfile-build-buffer "dockerfile-mode" "\ Build an image called IMAGE-NAME based upon the buffer. -If prefix arg NO-CACHE is set, don't cache the image. -The build string will be of the format: -`sudo docker build --no-cache --force-rm --pull --force-rm --tag IMAGE-NAME --build-args arg1.. --progress PROGRESS_TYPE -f filename directory` +If the prefix arg NO-CACHE is set, don't cache the image. -\(fn IMAGE-NAME &optional NO-CACHE)" t nil) +The shell command used to build the image is: + + sudo docker build \\ + --no-cache \\ + --force-rm \\ + --pull \\ + --tag IMAGE-NAME \\ + --build-args args \\ + --progress type \\ + -f filename \\ + 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. -\(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 '("/Dockerfile\\(?:\\.[^/\\]*\\)?\\'" . dockerfile-mode)) +(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/emacs-dockerfile-mode.spec b/emacs-dockerfile-mode.spec index 2e62b49..88276a6 100644 --- a/emacs-dockerfile-mode.spec +++ b/emacs-dockerfile-mode.spec @@ -1,11 +1,11 @@ %global pkg dockerfile-mode Name: emacs-%{pkg} -Version: 1.8 -Release: 2%{?dist} +Version: 1.9 +Release: 1%{?dist} Summary: An emacs mode for handling Dockerfiles -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/spotify/%{pkg} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: %{pkg}-init.el @@ -45,6 +45,10 @@ install -Dpm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/%{pkg}-init.e %changelog +* Sat Mar 02 2024 Mohamed El Morabity - 1.9-1 +- Update to 1.9 +- Migrate to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 5bd0ebd..a7d10b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (emacs-dockerfile-mode-1.8.tar.gz) = 8bae08037813730b93919135fe727a6506bfb0decdc385b22afe41d7f1df750d3f0cc508453faa7b0e90d347584f805acca54bbf7da6cae2cf3108ff1047fd58 +SHA512 (emacs-dockerfile-mode-1.9.tar.gz) = fdf37d15b0ee7608aa1580850ec0475a02cc3357ac1c262934063bd6efc0ab00fd3ef2b11389f221994fb3428def525f7d14e5da198bdd27b7f3f26fb0a94746