Skip to content

Refactor docker targets to allow running with no image update #1038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matsl wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −4
Open

Refactor docker targets to allow running with no image update #1038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2026-08-14 Mats Lidell <matsl@gnu.org>

* Makefile (docker-latest, docker-run-latest): Update image if needed
before running the docker job.
(docker, docker-run): Remove dependency on update so targets can
be used with no automated update check.

2026-08-11 Mats Lidell <matsl@gnu.org>

* (check-copyright): Check copyright and SPDX headers.
Expand Down
25 changes: 21 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
# Last-Mod: 11-Aug-26 at 23:39:12 by Mats Lidell
# Last-Mod: 14-Aug-26 at 22:22:27 by Mats Lidell
#
# Copyright (C) 1994-2026 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
Expand Down Expand Up @@ -86,7 +86,7 @@
# make docker-run - default to running master
# make docker-run version=28.2 - run Emacs V28.2
#
# To build and test a dockerized version of Emacs with Hyperbole:
# To build and test a Hyperbole with a dockerized version of Emacs:
# make docker - defaults: version=master targets='clean bin test'
#
# make docker version=28.2 targets='clean bin' - byte-compile Hyperbole with Emacs 28.2
Expand All @@ -96,6 +96,15 @@
# make docker-batch-tests - run all non-interactive tests in docker for all CI/CD Emacs versions
# make docker-all-tests - run all tests in docker for all CI/CD Emacs versions
#
# To update the docker image for Emacs:
# make docker-update - default: version=master
# The convenience targets docker-latest and
# docker-run-latest updates the image if needed
# available before running the docker job.
#
# To clean the local elpa docker volume use:
# make docker-clean

# Verify hyperbole installation using different sources:
# make install-<source>
# Where source can be 'elpa', 'elpa-devel', 'tarball' (tarball from elpa-devel),
Expand Down Expand Up @@ -676,14 +685,22 @@ endif
recompile-docker-elpa:
$(EMACS_BATCH) --eval "(byte-recompile-directory \"/root/.emacs.d/elpa\" 0 'force)"

.PHONY: docker-latest
docker-latest: docker-update
$(MAKE) docker

.PHONY: docker
docker: docker-update
docker:
docker run --mount type=volume,src=elpa-local,dst=/root/.emacs.d/elpa \
-v $$(pwd):/hypb -v /tmp:/hypb-tmp -it --rm silex/emacs:${DOCKER_VERSION} \
bash -c "cp -a /hypb /hyperbole && find /hyperbole -name '*.elc' -delete && make -C hyperbole recompile-docker-elpa ${DOCKER_TARGETS}"

.PHONY: docker-run-latest
docker-run-latest: docker-update
$(MAKE) docker-run

.PHONY: docker-run
docker-run: docker-update
docker-run:
docker run --mount type=volume,src=elpa-local,dst=/root/.emacs.d/elpa \
-v $$(pwd):/hypb -v /tmp:/hypb-tmp -it --rm silex/emacs:${DOCKER_VERSION}

Expand Down