Fossil SCM
Dropped the "container" namespace verb from $(CENGINE) in the container-* targets so that it will work under Apple Container, which uses the legacy scheme, doubtless to avoid having silly-looking "container container" commands. Podman and Docker still support that syntax; it was added to separate these subcommands out, a practice we adopted to make our example commands clear. Broader engine compatibility is more important. Also dropped the "build buildx" thing, as that also doesn't work on Apple Container, and it doesn't buy us anything we still need under Docker Engine, as long as you're on 23 or later. Podman never cared.
Commit
be50695420d38fd58aba6452f14133a19ccc08646dd139e467a0f073b976a4ee
Parent
90742e4c7ecceac…
2 files changed
+6
-7
+4
+6
-7
| --- Makefile.in | ||
| +++ Makefile.in | ||
| @@ -134,11 +134,11 @@ | ||
| 134 | 134 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 135 | 135 | CENGINE := docker |
| 136 | 136 | container: |
| 137 | 137 | $(CENGINE) image inspect $(IMGVER) > /dev/null 2>&1 || \ |
| 138 | 138 | $(MAKE) container-image |
| 139 | - $(CENGINE) container inspect $(CNTVER) > /dev/null 2>&1 || \ | |
| 139 | + $(CENGINE) inspect $(CNTVER) > /dev/null 2>&1 || \ | |
| 140 | 140 | $(CENGINE) create \ |
| 141 | 141 | --name $(CNTVER) \ |
| 142 | 142 | --cap-drop AUDIT_WRITE \ |
| 143 | 143 | --cap-drop CHOWN \ |
| 144 | 144 | --cap-drop FSETID \ |
| @@ -150,28 +150,27 @@ | ||
| 150 | 150 | --cap-drop SETPCAP \ |
| 151 | 151 | --publish 8080:8080 \ |
| 152 | 152 | $(DCFLAGS) $(IMGVER) $(DCCMD) |
| 153 | 153 | |
| 154 | 154 | container-clean: |
| 155 | - -$(CENGINE) container kill $(CNTVER) | |
| 156 | - -$(CENGINE) container rm $(CNTVER) | |
| 157 | - -$(CENGINE) image rm $(IMGVER) | |
| 155 | + -$(CENGINE) kill $(CNTVER) | |
| 156 | + -$(CENGINE) rm $(CNTVER) | |
| 157 | + -$(CENGINE) image rm $(IMGVER) | |
| 158 | 158 | |
| 159 | 159 | container-image: |
| 160 | 160 | $(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB) |
| 161 | - $(CENGINE) buildx build \ | |
| 162 | - --load \ | |
| 161 | + $(CENGINE) build \ | |
| 163 | 162 | --tag $(IMGVER) \ |
| 164 | 163 | --build-arg FSLURL=$(SRCTB) \ |
| 165 | 164 | $(DBFLAGS) @srcdir@ |
| 166 | 165 | rm -f $(SRCTB) |
| 167 | 166 | |
| 168 | 167 | container-run container-start: container |
| 169 | 168 | $(CENGINE) start $(DSFLAGS) $(CNTVER) |
| 170 | 169 | @sleep 1 # decrease likelihood of logging race condition |
| 171 | - $(CENGINE) container logs $(CNTVER) | |
| 170 | + $(CENGINE) logs $(CNTVER) | |
| 172 | 171 | |
| 173 | 172 | container-stop: |
| 174 | 173 | $(CENGINE) stop $(CNTVER) |
| 175 | 174 | |
| 176 | 175 | container-version: |
| 177 | 176 | @echo $(CNTVER) |
| 178 | 177 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -134,11 +134,11 @@ | |
| 134 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 135 | CENGINE := docker |
| 136 | container: |
| 137 | $(CENGINE) image inspect $(IMGVER) > /dev/null 2>&1 || \ |
| 138 | $(MAKE) container-image |
| 139 | $(CENGINE) container inspect $(CNTVER) > /dev/null 2>&1 || \ |
| 140 | $(CENGINE) create \ |
| 141 | --name $(CNTVER) \ |
| 142 | --cap-drop AUDIT_WRITE \ |
| 143 | --cap-drop CHOWN \ |
| 144 | --cap-drop FSETID \ |
| @@ -150,28 +150,27 @@ | |
| 150 | --cap-drop SETPCAP \ |
| 151 | --publish 8080:8080 \ |
| 152 | $(DCFLAGS) $(IMGVER) $(DCCMD) |
| 153 | |
| 154 | container-clean: |
| 155 | -$(CENGINE) container kill $(CNTVER) |
| 156 | -$(CENGINE) container rm $(CNTVER) |
| 157 | -$(CENGINE) image rm $(IMGVER) |
| 158 | |
| 159 | container-image: |
| 160 | $(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB) |
| 161 | $(CENGINE) buildx build \ |
| 162 | --load \ |
| 163 | --tag $(IMGVER) \ |
| 164 | --build-arg FSLURL=$(SRCTB) \ |
| 165 | $(DBFLAGS) @srcdir@ |
| 166 | rm -f $(SRCTB) |
| 167 | |
| 168 | container-run container-start: container |
| 169 | $(CENGINE) start $(DSFLAGS) $(CNTVER) |
| 170 | @sleep 1 # decrease likelihood of logging race condition |
| 171 | $(CENGINE) container logs $(CNTVER) |
| 172 | |
| 173 | container-stop: |
| 174 | $(CENGINE) stop $(CNTVER) |
| 175 | |
| 176 | container-version: |
| 177 | @echo $(CNTVER) |
| 178 |
| --- Makefile.in | |
| +++ Makefile.in | |
| @@ -134,11 +134,11 @@ | |
| 134 | CNTVER := fossil-@FOSSIL_CI_PFX@ |
| 135 | CENGINE := docker |
| 136 | container: |
| 137 | $(CENGINE) image inspect $(IMGVER) > /dev/null 2>&1 || \ |
| 138 | $(MAKE) container-image |
| 139 | $(CENGINE) inspect $(CNTVER) > /dev/null 2>&1 || \ |
| 140 | $(CENGINE) create \ |
| 141 | --name $(CNTVER) \ |
| 142 | --cap-drop AUDIT_WRITE \ |
| 143 | --cap-drop CHOWN \ |
| 144 | --cap-drop FSETID \ |
| @@ -150,28 +150,27 @@ | |
| 150 | --cap-drop SETPCAP \ |
| 151 | --publish 8080:8080 \ |
| 152 | $(DCFLAGS) $(IMGVER) $(DCCMD) |
| 153 | |
| 154 | container-clean: |
| 155 | -$(CENGINE) kill $(CNTVER) |
| 156 | -$(CENGINE) rm $(CNTVER) |
| 157 | -$(CENGINE) image rm $(IMGVER) |
| 158 | |
| 159 | container-image: |
| 160 | $(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB) |
| 161 | $(CENGINE) build \ |
| 162 | --tag $(IMGVER) \ |
| 163 | --build-arg FSLURL=$(SRCTB) \ |
| 164 | $(DBFLAGS) @srcdir@ |
| 165 | rm -f $(SRCTB) |
| 166 | |
| 167 | container-run container-start: container |
| 168 | $(CENGINE) start $(DSFLAGS) $(CNTVER) |
| 169 | @sleep 1 # decrease likelihood of logging race condition |
| 170 | $(CENGINE) logs $(CNTVER) |
| 171 | |
| 172 | container-stop: |
| 173 | $(CENGINE) stop $(CNTVER) |
| 174 | |
| 175 | container-version: |
| 176 | @echo $(CNTVER) |
| 177 |
+4
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -41,10 +41,14 @@ | ||
| 41 | 41 | change is usually invisible but it allows specific pages to |
| 42 | 42 | plug in styling and/or JavaScript functionality. In |
| 43 | 43 | [/help/www/chat|/chat], tapping on a reference in the form |
| 44 | 44 | "#1234" will jump to that message if it's loaded or search for |
| 45 | 45 | it if it's not. |
| 46 | + <li> Reworked the <tt>make container-*</tt> targets so that they work with | |
| 47 | + <tt>CENGINE=container</tt> on macOS. For the Docker default, this | |
| 48 | + requires Engine 23, as it drops the old <tt>docker build buildx</tt> | |
| 49 | + in favor of plain <tt>docker build</tt>. Also tested with Podman 6. | |
| 46 | 50 | </ol> |
| 47 | 51 | |
| 48 | 52 | <h2 id='v2_28'>Changes for version 2.28 (2026-03-11)</h2><ol> |
| 49 | 53 | <li> Improvements to [./antibot.wiki|anti-robot defenses]:<ol type="a"> |
| 50 | 54 | <li> The default configuration now allows robots to download any tarball |
| 51 | 55 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -41,10 +41,14 @@ | |
| 41 | change is usually invisible but it allows specific pages to |
| 42 | plug in styling and/or JavaScript functionality. In |
| 43 | [/help/www/chat|/chat], tapping on a reference in the form |
| 44 | "#1234" will jump to that message if it's loaded or search for |
| 45 | it if it's not. |
| 46 | </ol> |
| 47 | |
| 48 | <h2 id='v2_28'>Changes for version 2.28 (2026-03-11)</h2><ol> |
| 49 | <li> Improvements to [./antibot.wiki|anti-robot defenses]:<ol type="a"> |
| 50 | <li> The default configuration now allows robots to download any tarball |
| 51 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -41,10 +41,14 @@ | |
| 41 | change is usually invisible but it allows specific pages to |
| 42 | plug in styling and/or JavaScript functionality. In |
| 43 | [/help/www/chat|/chat], tapping on a reference in the form |
| 44 | "#1234" will jump to that message if it's loaded or search for |
| 45 | it if it's not. |
| 46 | <li> Reworked the <tt>make container-*</tt> targets so that they work with |
| 47 | <tt>CENGINE=container</tt> on macOS. For the Docker default, this |
| 48 | requires Engine 23, as it drops the old <tt>docker build buildx</tt> |
| 49 | in favor of plain <tt>docker build</tt>. Also tested with Podman 6. |
| 50 | </ol> |
| 51 | |
| 52 | <h2 id='v2_28'>Changes for version 2.28 (2026-03-11)</h2><ol> |
| 53 | <li> Improvements to [./antibot.wiki|anti-robot defenses]:<ol type="a"> |
| 54 | <li> The default configuration now allows robots to download any tarball |
| 55 |