-
Notifications
You must be signed in to change notification settings - Fork 2k
🚑 Fix some BC break in ext install. #269
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
Conversation
docker-php-ext-install
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nested if
as its not that easy to make some XOR in shell scripts.
Looks good to me thanks @shouze ! |
docker-php-source
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will break our detection of the php source being already extracted on line 22
Also, this is somehow spaces instead of tabs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, will fix that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️ Thanks
ping @yosifkit ok, amended fixes in the commit. |
exit 1 | ||
fi | ||
if [ ! -d "$dir" ]; then | ||
if [[ ! -d "$dir" || $(ls -1 "$dir") == "ext" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just don't check that ext
is a directory here... but I think we shouldn't care because people in this case would intentionally make their builds fail I guess ^^
I don't feel like this is a complete solution. Seeing that many users were using RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
&& cd /usr/src/php/ext/memcached && git checkout -b php7 origin/php7 \
&& docker-php-ext-install zip \
# at which point their memcached source is now gone
&& docker-php-ext-configure memcached \
&& docker-php-ext-install memcached Or we could do as @tianon suggested and revert the change on the regular Debian images. I am leaning toward this idea right now |
@yosifkit ping #269 (comment) |
Fixes #266. Related to #256 changes.