Fossil

Check-in [a9e862b8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:The "container-run" target now runs "container-image" conditionally, building it only if it wasn't created in a prior step. This allows custom image builds followed by a one-command way of running that built image. Without this, the custom image gets stomped on.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a9e862b88716a83af87053f0f0214d4acf51120e73aeaedd5b4602bfbea3a538
User & Date: wyoung 2022-11-30 12:19:33
Context
2022-11-30
12:23
Put a "sleep 1" into "make container-run" before the step that shows the container logs to ensure we show everything it says on startup. Added this on seeing just the first line of output due to a race condition, so I missed the generated admin password. ... (check-in: 4429e10f user: wyoung tags: trunk)
12:19
The "container-run" target now runs "container-image" conditionally, building it only if it wasn't created in a prior step. This allows custom image builds followed by a one-command way of running that built image. Without this, the custom image gets stomped on. ... (check-in: a9e862b8 user: wyoung tags: trunk)
11:44
Reverted the build hack to strip out all but the default and darkmode skins in the stock Dockerfile. That was done to cater to a wish for extremely small ARM builds, for fun, not for any practical reason. It conflicts with a key philosophy behind this container project, to create stock Fossil builds by default. "make container-image" should get you a functionally identical binary inside the container as "./configure && make" does outside it. ... (check-in: 3e95d945 user: wyoung tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.in.

125
126
127
128
129
130
131
132


133
134
135
136
137
138
139
	$(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB)
	docker build \
		--tag fossil:@FOSSIL_CI_PFX@ \
		--build-arg FSLURL=$(SRCTB) \
		$(DBFLAGS) @srcdir@
	rm -f $(SRCTB)

container-run: container-image


	docker run \
		--name fossil-@FOSSIL_CI_PFX@ \
		--cap-drop AUDIT_WRITE \
		--cap-drop CHOWN \
		--cap-drop FSETID \
		--cap-drop KILL \
		--cap-drop MKNOD \







|
>
>







125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
	$(APPNAME) tarball --name src @FOSSIL_CI_PFX@ $(SRCTB)
	docker build \
		--tag fossil:@FOSSIL_CI_PFX@ \
		--build-arg FSLURL=$(SRCTB) \
		$(DBFLAGS) @srcdir@
	rm -f $(SRCTB)

container-run:
	docker image inspect fossil:@FOSSIL_CI_PFX@ > /dev/null 2>&1 || \
		$(MAKE) container-image
	docker run \
		--name fossil-@FOSSIL_CI_PFX@ \
		--cap-drop AUDIT_WRITE \
		--cap-drop CHOWN \
		--cap-drop FSETID \
		--cap-drop KILL \
		--cap-drop MKNOD \