[elpa] externals/hyperbole 1f05dcfb76 14/16: Merge pull request #549 from rswgnu/update-docker-targets

[ELPA Syncer]

branch: externals/hyperbole
commit 1f05dcfb7651d9abef5e50334b1e8b7b08eab894
Merge: 8a8367189c 4a2b722a03
Author: Robert Weiner <rsw@gnu.org>
Commit: GitHub <noreply@github.com>

    Merge pull request #549 from rswgnu/update-docker-targets
    
    Use basename docker, depend on update to ensure latest image
---
 ChangeLog |  7 ++++++-
 Makefile  | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 77a0d444e4..a73d8dd728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,12 @@
   hmouse-drv.el (hkey-execute, hkey-help): Change 'eval' to 'hypb:eval-debug'
     to show a backtrace whenever an error occurs.
 
+2024-06-24  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (docker, docker-run, docker-update): Use simpler "docker" for
+    the docker targets. Make docker and docker-run depend on docker-update
+    to ensure we always use the latest version of the docker image.
+
 2024-06-23  Bob Weiner  <rsw@gnu.org>
 
 * hynote.el (hynote-get-files, hynote-get-file-stem-list, hynote-find-file,
@@ -34,7 +40,6 @@
             (hynote-file): Add ibtype to display non-HyWikiWord files in
     hywiki-directory'.
 
-
 * Makefile: (docker-run): Add to intweractively run docker versions
     of Emacs with Hyperbole.  Update Commentary to summarize docker
     targets that build, byte-compile and run Hyperbole.
diff --git a/Makefile b/Makefile
index fc840442c6..9e03720af2 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Author:       Bob Weiner
 #
 # Orig-Date:    15-Jun-94 at 03:42:38
-# Last-Mod:     29-Jun-24 at 18:59:38 by Bob Weiner
+# Last-Mod:     24-Jun-24 at 23:49:29 by Mats Lidell
 #
 # Copyright (C) 1994-2023  Free Software Foundation, Inc.
 # See the file HY-COPY for license information.
@@ -77,14 +77,14 @@
 #                   make test-all              - run all tests starting an 
interactive Emacs
 #                   make test test=<test-name> - run a single test or tests 
matching the name
 #
-#               To interactively run a dockerized version of Emacs with 
Hyperbole:
-#                   make dockerized-run                - default to running 
master
-#                   make dockerized-run version=27.1   - run Emacs V27.1
+#               To interactively run a docker version of Emacs with Hyperbole:
+#                   make docker-run              - default to running master
+#                   make docker-run version=27.1 - run Emacs V27.1
 #
 #               To build and test a dockerized version of Emacs with Hyperbole:
-#                   make dockerized                    - defaults: 
version=master targets='clean bin test'
+#                   make docker                  - defaults: version=master 
targets='clean bin test'
 #
-#                   make dockerized version=28.2 targets='clean bin' - Emacs 
28.2 with Hyperbole byte-compiled (possibly natively compiled)
+#                   make docker version=28.2 targets='clean bin' - 
byte-compile Hyperbole with Emacs 28.2
 #
 #               Verify hyperbole installation using different sources:
 #                   make install-<source>
@@ -553,7 +553,7 @@ lint:
        -l package-lint.el -f package-lint-batch-and-exit \
        $(EL_KOTL) $(EL_SRC)
 
-# Dockerized versions of Emacs for interactive running and test execution
+# Docker versions of Emacs for interactive running and test execution
 
 # Specify version and targets to run
 ifeq ($(origin targets), command line)
@@ -567,14 +567,14 @@ else
 DOCKER_VERSION = master-ci
 endif
 
-dockerized:
+docker: docker-update
        docker run -v $$(pwd):/hypb -it silex/emacs:${DOCKER_VERSION} bash -c 
"cp -a /hypb /hyperbole && make -C hyperbole ${DOCKER_TARGETS}"
 
-dockerized-run:
+docker-run: docker-update
        docker run -v $$(pwd):/hypb -it silex/emacs:${DOCKER_VERSION}
 
 # Update the docker image for the specified version of Emacs
-dockerized-update:
+docker-update:
        docker pull silex/emacs:${DOCKER_VERSION}
 
 # Run with coverage. Run tests given by testspec and monitor the