Generate Dockerfiles from Selmer templates#286
Merged
Conversation
Replace the hand-rolled string/vector concatenation in the Dockerfile
generators with Selmer templates under resources/templates/:
- Dockerfile.tmpl - the outer skeleton (FROM, JDK copy, install section(s),
entrypoint, CMD)
- lein.tmpl - the leiningen install section
- tools-deps.tmpl - the tools-deps install section
The templates read like real Dockerfiles: the install RUN commands live in
them directly, with the distro-specific dep lists looped in and dynamic
values (checksums, signing key, bundled clojure version) interpolated as
Selmer placeholders. The build-tool namespaces are reduced to computing that
context.
Output is identical to before for every image except the combined "latest"
image, which loses a stray blank line between ENTRYPOINT and CMD so it
matches the single-build-tool images. Verified by regenerating under both
babashka (bb run dockerfiles) and the JVM build-images path. bb test and
cljfmt pass.
Adds selmer/selmer to deps.edn for the JVM path; babashka bundles Selmer.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Replaces the hand-rolled string/vector concatenation in the Dockerfile generators with Selmer templates under
resources/templates/:Dockerfile.tmpl— outer skeleton (FROM, JDK copy, install section(s), entrypoint, CMD)lein.tmpl/tools-deps.tmpl— the per-build-tool install sectionsThe templates read like real Dockerfiles: the install
RUNcommands live in them directly, with the distro-specific dependency lists looped in and dynamic values (checksums, the GPG signing key, the bundled clojure version) interpolated as Selmer placeholders. The build-tool namespaces shrink to just computing that context.Why
The previous approach assembled Dockerfiles by concatenating vectors of strings and suffixing
&& \line continuations, which made the shape of the generated file hard to follow. Moving the skeleton and commands into template files makes them legible at a glance.Output changes
Identical to
masterfor every image except the combinedlatestimage, which loses a stray blank line betweenENTRYPOINTandCMDso it matches the single-build-tool images:ENTRYPOINT ["entrypoint"] - CMD ["-M", "--repl"]Verified by regenerating every Dockerfile under both the babashka (
bb run dockerfiles) and JVM (clojure -X:build-images) paths.bb test(12 tests, 51 assertions) andcljfmt checkboth pass.Notes
selmer/selmertodeps.ednfor the JVM path; babashka bundles Selmer.1.12.1) is now a named const instead of being hardcoded inline.