Differences From Artifact [45f47ce65e]:

• Executable file Makefile.in — part of check-in [f938438380] at 2022-08-15 22:02:20 on branch trunk — Changed several of the Docker environment variables to build arguments so the user an override them at build time rather than container creation time, and documented them in build.wiki. Using this new mechanism to pull the Fossil source tarball in such a way that we can use the Docker artifact cache without getting stale builds. You can now pass one of the new build args to force the old behavior if you want it. This required generating Dockerfile from Dockerfile.in at configure time, to inject the current Fossil checkin ID. (This busts the Docker cache when the source tree changes.) (user: wyoung size: 4196)

To Artifact [69eb42582b]:

• Executable file Makefile.in — part of check-in [67386c75f5] at 2022-08-15 23:21:59 on branch trunk — Added the container-image and container-run top-level build targets to manage dependencies better and to auto-version the build products. (user: wyoung size: 4474)

111
112
113
114
115
116
117
118
119
120

# our depdendencies besides Makefile.in, we'll reconfigure but Makefile
# won't change, so this rule will remain out of date, so we'll reconfig
# but Makefile won't change, so we'll reconfig but... endlessly.
#
# This is also why we repeat the reconfig target's command here instead
# of delegating to it with "$(MAKE) reconfig": having children running
# around interfering makes this failure mode even worse.
Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@ @srcdir@/Dockerfile.in
	@AUTOREMAKE@
	touch @builddir@/Makefile

|


>
>
>
>
>
>
>
>
>
>
>

111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131

# our depdendencies besides Makefile.in, we'll reconfigure but Makefile
# won't change, so this rule will remain out of date, so we'll reconfig
# but Makefile won't change, so we'll reconfig but... endlessly.
#
# This is also why we repeat the reconfig target's command here instead
# of delegating to it with "$(MAKE) reconfig": having children running
# around interfering makes this failure mode even worse.
Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@
	@AUTOREMAKE@
	touch @builddir@/Makefile

# Container stuff
container-image: @srcdir@/Dockerfile
	docker build -t fossil:@FOSSIL_CI_PFX@ $(DBFLAGS) @srcdir@

container-run: container
	docker run --name fossil-@FOSSIL_CI_PFX@ $(DRFLAGS) fossil:@FOSSIL_CI_PFX@

@srcdir@/Dockerfile: @srcdir@/Dockerfile.in @srcdir@/manifest.uuid
	@AUTOREMAKE@