Skip to content

Commit

Permalink
Rdkafka: removed problematic extension
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryan Latten committed Apr 3, 2017
1 parent 84f008d commit 161cc1b
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 51 deletions.
5 changes: 0 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ RUN /bin/bash -e /security_updates.sh && \
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
add-apt-repository ppa:git-core/ppa -y && \
add-apt-repository ppa:ondrej/php -y && \
add-apt-repository ppa:guessi/librdkafka -y && \
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
# Prevent newrelic install from prompting for input \
Expand Down Expand Up @@ -87,7 +86,6 @@ RUN apt-get update -q && \
newrelic-php5-common=${NEWRELIC_VERSION} \
newrelic-daemon=${NEWRELIC_VERSION} \
libyaml-dev \
librdkafka-dev \
&& \
phpdismod pdo_pgsql && \
phpdismod pgsql && \
Expand All @@ -100,9 +98,6 @@ RUN apt-get update -q && \
# Install new PHP7-stable version of Redis \
pecl install redis-3.1.1 && \
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
# Install kafka extension
pecl install rdkafka-3.0.1 && \
echo "extension=rdkafka.so" > $CONF_PHPMODS/rdkafka.ini && \
# Remove dev packages that were only in place just to compile extensions
apt-get remove --purge -yq \
php7.0-dev \
Expand Down
4 changes: 0 additions & 4 deletions Dockerfile-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ RUN apk update && \
php7-xsl \
php7-zip \
php7-zlib \
librdkafka-dev@edge \
&& \
# Alpine + Ubuntu use different versioned names --> now standardized \
ln -s /usr/bin/php7 /usr/bin/php && \
Expand Down Expand Up @@ -130,9 +129,6 @@ RUN apk update && \
# Install new PHP7-stable version of Redis \
pecl install redis-3.1.1 && \
echo ";extension=redis.so" > $CONF_PHPMODS/redis.ini && \
# Install kafka extension
pecl install rdkafka && \
echo ";extension=rdkafka.so" > $CONF_PHPMODS/rdkafka.ini && \
rm -rf /usr/share/php7 && \
apk del .phpize_deps && \
/bin/bash -e /clean.sh
Expand Down
5 changes: 0 additions & 5 deletions Dockerfile-edge
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ RUN /bin/bash -e /security_updates.sh && \
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
add-apt-repository ppa:git-core/ppa -y && \
add-apt-repository ppa:ondrej/php -y && \
add-apt-repository ppa:guessi/librdkafka -y && \
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
# Prevent newrelic install from prompting for input \
Expand Down Expand Up @@ -87,7 +86,6 @@ RUN apt-get update -q && \
newrelic-php5-common=${NEWRELIC_VERSION} \
newrelic-daemon=${NEWRELIC_VERSION} \
libyaml-dev \
librdkafka-dev \
&& \
phpdismod pdo_pgsql && \
phpdismod pgsql && \
Expand All @@ -100,9 +98,6 @@ RUN apt-get update -q && \
# Install new PHP 7.1-stable version of Redis
pecl install redis-3.1.1 && \
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
# Install kafka extension
pecl install rdkafka-3.0.1 && \
echo "extension=rdkafka.so" > $CONF_PHPMODS/rdkafka.ini && \
# Remove dev packages that were only in place just to compile extensions
apt-get remove --purge -yq \
php7.1-dev \
Expand Down
5 changes: 0 additions & 5 deletions Dockerfile-legacy
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ RUN /bin/bash -e /security_updates.sh && \
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
add-apt-repository ppa:git-core/ppa -y && \
add-apt-repository ppa:ondrej/php -y && \
add-apt-repository ppa:guessi/librdkafka -y && \
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
# Prevent newrelic install from prompting for input \
Expand Down Expand Up @@ -87,7 +86,6 @@ RUN apt-get update -q && \
newrelic-php5-common=${NEWRELIC_VERSION} \
newrelic-daemon=${NEWRELIC_VERSION} \
libyaml-dev \
librdkafka-dev \
&& \
phpdismod pdo_pgsql && \
phpdismod pgsql && \
Expand All @@ -100,9 +98,6 @@ RUN apt-get update -q && \
# Install new PHP5-stable version of Redis \
pecl install redis-3.1.1 && \
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
# Install kafka extension
pecl install rdkafka-3.0.1 && \
echo "extension=rdkafka.so" > $CONF_PHPMODS/rdkafka.ini && \
# Remove dev packages that were only in place just to compile extensions
apt-get remove --purge -yq \
php5.6-dev \
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ Three variants are available:
- pgsql~
- phar
- posix
- rdkafka~
- redis~
- shmop
- SimpleXML
Expand Down
7 changes: 0 additions & 7 deletions container/root/tests/php-fpm/alpine.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@ command:
exit-status: 0
stdout: [PHP 7.0]
stderr: ['!/./']
php -n -d extension=rdkafka.so -m | grep rdkafka:
exit-status: 0
stderr: ['!/./']
# Assert librdkafka version -0.9.*
apk info librdkafka | grep "librdkafka-0.9.":
exit-status: 0
stderr: ['!/./']

package:
php7:
Expand Down
6 changes: 0 additions & 6 deletions container/root/tests/php-fpm/base.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ command:
php -m | grep pgsql:
exit-status: 1
stderr: ['!/./']
php -m | grep rdkafka:
exit-status: 1
stderr: ['!/./']
php -m | grep redis:
exit-status: 1
stderr: ['!/./']
Expand All @@ -140,9 +137,6 @@ command:
php -n -d extension=pdo.so -d extension=pdo_pgsql.so -m | grep pdo_pgsql:
exit-status: 0
stderr: ['!/./']
php -n -d extension=rdkafka.so -m | grep rdkafka:
exit-status: 0
stderr: ['!/./']
# On some variants, session is not loaded as part of the core, and must be loaded at this time
php -n -d extension=session.so -d extension=redis.so -m | grep redis:
exit-status: 0
Expand Down
5 changes: 0 additions & 5 deletions container/root/tests/php-fpm/edge.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ command:
exit-status: 0
stdout: [PHP 7.1]
stderr: ['!/./']
# Assert librdkafka version
dpkg -s librdkafka-dev | grep 0.9.1:
exit-status: 0
stderr: ['!/./']
stdout: ['0.9.1']

package:
php7.1:
Expand Down
5 changes: 0 additions & 5 deletions container/root/tests/php-fpm/legacy.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ command:
exit-status: 0
stdout: [PHP 5.6]
stderr: ['!/./']
# Assert librdkafka version
dpkg -s librdkafka-dev | grep 0.9.1:
exit-status: 0
stderr: ['!/./']
stdout: ['0.9.1']

package:
php5.6:
Expand Down
8 changes: 0 additions & 8 deletions container/root/tests/php-fpm/ubuntu.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ command:
exit-status: 0
stdout: [PHP 7.0]
stderr: ['!/./']
php -n -d extension=rdkafka.so -m | grep rdkafka:
exit-status: 0
stderr: ['!/./']
# Assert librdkafka version
dpkg -s librdkafka-dev | grep 0.9.1:
exit-status: 0
stderr: ['!/./']
stdout: ['0.9.1']

package:
php7.0:
Expand Down

0 comments on commit 161cc1b

Please sign in to comment.