This repository has been archived by the owner on Nov 9, 2020. It is now read-only.
Fix the issue that installation on Ubuntu Docker host with docker version 17.03.0-ce. #1028
Conversation
This file contains 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
shaominchen
reviewed
Mar 13, 2017
vmdk_plugin/Makefile
Outdated
| @@ -200,7 +200,8 @@ FPM_COMMON := -p $(BIN) \ | |||
| .PHONY: deb | |||
| deb: pkg-prep deb-pkg-prep | |||
| @$(CHECK) pkg | |||
| $(FPM) --deb-no-default-config-files $(FPM_COMMON) -d '$(DOCKER_PACKAGE) > $(MIN_DOCKER_VERSION)' -t deb . | |||
| #$(FPM) --deb-no-default-config-files $(FPM_COMMON) -d '$(DOCKER_PACKAGE) > $(MIN_DOCKER_VERSION)' -t deb . | |||
There was a problem hiding this comment.
Do we still need this?
There was a problem hiding this comment.
Actually, we don't need.
There was a problem hiding this comment.
Then let's just remove it.
There was a problem hiding this comment.
While there, let's also remove L213 & L217
There was a problem hiding this comment.
on the same note: Line#47-49 should be removed as part of this cleanup activity.
There was a problem hiding this comment.
I think the cleanup does not have to happen in this PR. We just need it working first; cleanup wil require more testing and I am not sure it will have any impact on the end result.
pdhamdhere
approved these changes
Mar 13, 2017
shaominchen
approved these changes
Mar 13, 2017
shuklanirdesh82
suggested changes
Mar 13, 2017
vmdk_plugin/Makefile
Outdated
| @@ -200,7 +200,8 @@ FPM_COMMON := -p $(BIN) \ | |||
| .PHONY: deb | |||
| deb: pkg-prep deb-pkg-prep | |||
| @$(CHECK) pkg | |||
| $(FPM) --deb-no-default-config-files $(FPM_COMMON) -d '$(DOCKER_PACKAGE) > $(MIN_DOCKER_VERSION)' -t deb . | |||
| #$(FPM) --deb-no-default-config-files $(FPM_COMMON) -d '$(DOCKER_PACKAGE) > $(MIN_DOCKER_VERSION)' -t deb . | |||
There was a problem hiding this comment.
on the same note: Line#47-49 should be removed as part of this cleanup activity.
msterin
approved these changes
Mar 14, 2017
lipingxue
force-pushed
the
fix_docker_install_script.liping
branch
from
ca723fe
to
091e90b
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #1023
Tested with fresh Ubuntu 17.03.0-ce install.