Skip to content

Fix tar with symlink#1218

Merged
KostyaSha merged 2 commits intodocker-java:masterfrom
hugares:fix-tar-with-symlink
Jul 12, 2019
Merged

Fix tar with symlink#1218
KostyaSha merged 2 commits intodocker-java:masterfrom
hugares:fix-tar-with-symlink

Conversation

@hugares
Copy link
Copy Markdown
Contributor

@hugares hugares commented Jul 11, 2019

Closes #532


This change is Reviewable

hugares added 2 commits July 10, 2019 21:19
This remove the duplicated code to handle executable file and copy of
the file content into the archive. It will also allow to fix the symlink
without duplicating the fix in 3 places.

Related to issue docker-java#532
Symbolic link should be archived as is, same as what native docker
client does.

Closes docker-java#532
@hugares
Copy link
Copy Markdown
Contributor Author

hugares commented Jul 11, 2019

Could you not squash the commits when merging this PR to preserve detailed commit messages in the git history.

Thanks for all the swift reviews!

@KostyaSha
Copy link
Copy Markdown
Member

I'm not squashing when commits are clear and not numerious fixups )

@KostyaSha KostyaSha modified the milestones: 3.1.1, 3.1.3 Jul 12, 2019
@KostyaSha KostyaSha merged commit 390ec49 into docker-java:master Jul 12, 2019
@hugares hugares deleted the fix-tar-with-symlink branch July 19, 2019 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build command fails when symlinks in docker folder are used

2 participants