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.
This PR bumps the
lfmerge
image version in order to reduce the size of the lfmerge image. The reduced size may not be immediately visible with this PR, as it will still have to download a 700 MB layer in the Docker image. But with the changes I've made to the lfmerge build process, that should be the last time that Docker image layer has to be downloaded, and subsequent lfmerge releases should be able to reuse the same layer.Type of Change
Only keep lines below that describe this change, then delete the rest.
Instructions for testing
docker
directory, runmake
.docker/lfmerge/Dockerfile
and change version 2.0.111 to 2.0.112.make clean
, runmake
again.Checklist
qa.languageforge.org testing
Reviewers: add/replace your name below and check the box to sign-off/attest the feature works as expected on qa.languageforge.org