Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tini install snippet #5408

Merged
merged 2 commits into from
Feb 19, 2019
Merged

Conversation

Firefishy
Copy link
Contributor

  • Update tini to v0.18.0 (current latest release)
  • Add gpg recv-keys retry loop per Guidance on GPG best practices #4252
  • Switch to tini-static instead of dynamic build for automatic compatibility with alpine
  • Use tini --version instead of tini --help which is not available in TINI_MINIMAL releases.

Snippet tested on:

  • Ubuntu 12.04 to 18.04
  • Debian
  • Alpine

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not opposed to updating this, but I think it needs a bit more work (as I've noted in a few comments below).

Would you like to continue working on this, or would you prefer I take over from here?

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@Firefishy
Copy link
Contributor Author

Thank you for the awesome detailed PR comments. I have updated based on the comments.

  • Added notes in snipped to use distro tini if available
  • Switched to wget
  • Removed loop and used standard || logic (Bonus: works with centos /bin/sh now too)
  • Used gpgconf --kill all logic and removed the -f on rm
  • set -eux now and switched to using ;

Updated snipped tested on:

  • Ubuntu 12.04 to 18.10
  • Debian
  • Alpine
  • Centos 6+

@Firefishy
Copy link
Contributor Author

@tianon would you mind reviewing when you have a moment.

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added my suggestions.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
Grant Slater and others added 2 commits February 18, 2019 15:19
* Update tini to v0.18.0 (current latest release)
* Improve gpg recv-keys as unreliable otherwise
* Add comment about Alpine, Debian and Ubuntu now having tini packages
* Use tini --version instead of tini --help which is not available in TINI_MINIMAL releases

Snippet tested on:
* Ubuntu 12.04 to 18.10
* Debian
* Alpine
* Centos 6+
Co-Authored-By: Firefishy <github@firefishy.com>
@Firefishy
Copy link
Contributor Author

@yosifkit Thank you for the review. I have merged and squashed all the recommended changes.

@tianon tianon merged commit fc8d057 into docker-library:master Feb 19, 2019
@Firefishy Firefishy deleted the update-tini-docs branch February 19, 2019 22:04
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.

3 participants