🚑 Fix some BC break in ext install. #269
Conversation
| usage >&2 | ||
| exit 1 | ||
| if ! grep -qE "^$ext$" /usr/src/php-available-exts ; then | ||
| if [ ! -d "/usr/src/php/ext/$ext" ] ; then |
There was a problem hiding this comment.
nested if as its not that easy to make some XOR in shell scripts.
|
Looks good to me thanks @shouze ! |
| # were extracting some of their custom extensions in this directory | ||
| # See https://github.com/docker-library/php/issues/266 | ||
| # Was breaked by https://github.com/docker-library/php/pull/256 | ||
| mkdir -p /usr/src/php/ext |
There was a problem hiding this comment.
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.
Indeed, will fix that
|
ping @yosifkit ok, amended fixes in the commit. |
| @@ -19,7 +19,7 @@ case "$1" in | |||
| echo >&2 "$dir exists and is not a directory" | |||
| exit 1 | |||
| fi | |||
| if [ ! -d "$dir" ]; then | |||
| if [[ ! -d "$dir" || $(ls -1 "$dir") == "ext" ]]; then | |||
There was a problem hiding this comment.
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 memcachedOr 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.