Remove the Alpine argon2 library fix #850
Merged
Conversation
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
|
In merging #843 I've created a bit of an unpleasant merge conflict here -- I'll go ahead and clone this locally to rebase it to resolve the conflict given it was my doing. 😅 ❤️ |
The fix has been patched upstream in Alpine and upcoming PHP 7.4.0alpha2.
tianon
force-pushed
the
patch-php-7.4-alpha
branch
from
446e055 to
894ee59
Compare
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jun 26, 2019
Changes: - docker-library/php@04e67dc: Merge pull request docker-library/php#850 from petk/patch-php-7.4-alpha - docker-library/php@820403d: Also remove "update.sh" bits for ARGON2 hack removal - docker-library/php@894ee59: Remove the Alpine argon2 library fix - docker-library/php@2e2df06: Merge pull request docker-library/php#843 from J0WI/curl - docker-library/php@250c2d8: Add "set -u" and more consistency - docker-library/php@82d590a: Use already available curl and consistent code style - docker-library/php@c0f68b2: Merge pull request docker-library/php#845 from J0WI/alpine10 - docker-library/php@27cfb71: Update default to Alpine 3.10 - docker-library/php@3802051: Add Alpine 3.10
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Jun 27, 2019
Changes: - docker-library/php@bbcc3db: Update to 7.4.0alpha2 - docker-library/php@eaa29e4: Merge pull request docker-library/php#851 from infosiftr/with-pear - docker-library/php@e2331f5: Add "--with-pear" in 7.4 - docker-library/php@04e67dc: Merge pull request docker-library/php#850 from petk/patch-php-7.4-alpha - docker-library/php@820403d: Also remove "update.sh" bits for ARGON2 hack removal - docker-library/php@894ee59: Remove the Alpine argon2 library fix - docker-library/php@2e2df06: Merge pull request docker-library/php#843 from J0WI/curl - docker-library/php@250c2d8: Add "set -u" and more consistency - docker-library/php@82d590a: Use already available curl and consistent code style - docker-library/php@c0f68b2: Merge pull request docker-library/php#845 from J0WI/alpine10 - docker-library/php@27cfb71: Update default to Alpine 3.10 - docker-library/php@3802051: Add Alpine 3.10
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
hello, the fix has been patched upstream in Alpine v3.9 and v3.10 and upcoming PHP 7.4.0alpha2.
Thanks.