Skip to content

Commit 8e089e7

Browse files
authored
Merge pull request #123 from mikeklein13/kafka-9.1
librdkafka: install 9.1
2 parents 9df1835 + 735682d commit 8e089e7

File tree

7 files changed

+23
-2
lines changed

7 files changed

+23
-2
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN /bin/bash -e /security_updates.sh && \
3737
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3838
add-apt-repository ppa:git-core/ppa -y && \
3939
add-apt-repository ppa:ondrej/php -y && \
40+
add-apt-repository ppa:guessi/librdkafka -y && \
4041
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
4142
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
4243
# Prevent newrelic install from prompting for input \

Dockerfile-edge

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN /bin/bash -e /security_updates.sh && \
3737
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3838
add-apt-repository ppa:git-core/ppa -y && \
3939
add-apt-repository ppa:ondrej/php -y && \
40+
add-apt-repository ppa:guessi/librdkafka -y && \
4041
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
4142
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
4243
# Prevent newrelic install from prompting for input \

Dockerfile-legacy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN /bin/bash -e /security_updates.sh && \
3737
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3838
add-apt-repository ppa:git-core/ppa -y && \
3939
add-apt-repository ppa:ondrej/php -y && \
40+
add-apt-repository ppa:guessi/librdkafka -y && \
4041
echo 'deb http://apt.newrelic.com/debian/ newrelic non-free' | tee /etc/apt/sources.list.d/newrelic.list && \
4142
wget -O- https://download.newrelic.com/548C16BF.gpg | apt-key add - && \
4243
# Prevent newrelic install from prompting for input \

container/root/tests/php-fpm/alpine.goss.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ command:
2525
php -n -d extension=rdkafka.so -m | grep rdkafka:
2626
exit-status: 0
2727
stderr: ['!/./']
28+
# Assert librdkafka version
29+
apk info librdkafka | grep 0.9.1:
30+
exit-status: 0
31+
stderr: ['!/./']
32+
stdout: ['0.9.1']
2833

2934
package:
3035
php7:
@@ -109,5 +114,3 @@ package:
109114
installed: true
110115
php7-zlib:
111116
installed: true
112-
113-

container/root/tests/php-fpm/beta.goss.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ command:
1818
exit-status: 0
1919
stdout: [PHP 7.1]
2020
stderr: ['!/./']
21+
# Assert librdkafka version
22+
dpkg -s librdkafka-dev | grep 0.9.1:
23+
exit-status: 0
24+
stderr: ['!/./']
25+
stdout: ['0.9.1']
2126

2227
package:
2328
php7.1:

container/root/tests/php-fpm/legacy.goss.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ command:
2121
php -n -d extension=redis.so -m | grep redis:
2222
exit-status: 0
2323
stderr: ['!/./']
24+
# Assert librdkafka version
25+
dpkg -s librdkafka-dev | grep 0.9.1:
26+
exit-status: 0
27+
stderr: ['!/./']
28+
stdout: ['0.9.1']
2429

2530
package:
2631
php5.6:

container/root/tests/php-fpm/ubuntu.goss.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ command:
2424
php -n -d extension=rdkafka.so -m | grep rdkafka:
2525
exit-status: 0
2626
stderr: ['!/./']
27+
# Assert librdkafka version
28+
dpkg -s librdkafka-dev | grep 0.9.1:
29+
exit-status: 0
30+
stderr: ['!/./']
31+
stdout: ['0.9.1']
2732

2833
package:
2934
php7.0:

0 commit comments

Comments
 (0)