Fix builds in Docker#1047
Merged
droidmonkey merged 2 commits intokeepassxreboot:release/2.2.2from Oct 19, 2017
Merged
Conversation
Necessary for an Ubuntu 16.04, Docker 17.09.0-ce host See moby/moby#9448 (comment)
phoerious
approved these changes
Oct 12, 2017
Member
|
Could you please rebase this against release/2.2.2? Thanks! |
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
3 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.
Description
Motivation and context
This allows Docker builds to work correctly (for me).
How has this been tested?
I've tested this by creating my own appimage with
docker build -t keepassxc-build . && ./release-tool build --version 2.2.1 --no-source-tarball --plugins ''(after commenting out the check for a clean git repo).Screenshots (if appropriate):
Types of changes
Checklist:
('REQUIRED' items talking about passing tests and ASAN were removed)