Skip to content

Commit a3016c0

Browse files
authored
Merge pull request #1104 from nick-zh/fix-docker-build
update image
2 parents 272c2bc + 487f095 commit a3016c0

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

docker/Dockerfile

+7-15
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
1-
FROM formapro/nginx-php-fpm:latest-all-exts
1+
FROM formapro/nginx-php-fpm:7.3-latest-all-exts
22

33
## libs
44
RUN set -x && \
55
apt-get update && \
6-
apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php-dev php-redis php-pgsql git python
7-
8-
RUN set -x && \
9-
apt-get update && \
10-
apt-get install -y --no-install-recommends --no-install-suggests php-dev librabbitmq-dev make && \
11-
mkdir -p $HOME/php-amqp && \
12-
cd $HOME/php-amqp && \
13-
git clone https://github.com/pdezwart/php-amqp.git . && git checkout v1.9.3 && \
14-
phpize --clean && phpize && ./configure && make install
6+
apt-get install -y --no-install-recommends --no-install-suggests wget curl openssl ca-certificates nano netcat php7.3-dev php7.3-redis php7.3-pgsql git python php-amqp
157

168
## librdkafka
179
RUN set -x && \
1810
apt-get update && \
19-
apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php-dev && \
11+
apt-get install -y --no-install-recommends --no-install-suggests g++ php-pear php7.3-dev make && \
2012
mkdir -p $HOME/librdkafka && \
2113
cd $HOME/librdkafka && \
2214
git clone https://github.com/edenhill/librdkafka.git . && \
23-
git checkout v0.11.6 && \
15+
git checkout v1.0.0 && \
2416
./configure && make && make install && \
2517
pecl install rdkafka && \
26-
echo "extension=rdkafka.so" > /etc/php/7.2/cli/conf.d/10-rdkafka.ini && \
27-
echo "extension=rdkafka.so" > /etc/php/7.2/fpm/conf.d/10-rdkafka.ini
18+
echo "extension=rdkafka.so" > /etc/php/7.3/cli/conf.d/10-rdkafka.ini && \
19+
echo "extension=rdkafka.so" > /etc/php/7.3/fpm/conf.d/10-rdkafka.ini
2820

29-
COPY ./php/cli.ini /etc/php/7.2/cli/conf.d/1-dev_cli.ini
21+
COPY ./php/cli.ini /etc/php/7.3/cli/conf.d/1-dev_cli.ini
3022
COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
3123
RUN chmod u+x /usr/local/bin/entrypoint.sh
3224

0 commit comments

Comments
 (0)