Skip to content

Commit 6a06a4b

Browse files
committed
update to support php7.4
1 parent 04a068e commit 6a06a4b

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

Dockerfile

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN cd /tmp \
1212
&& dpkg -i /tmp/couchbase-release-1.0-4-amd64.deb \
1313
&& add-apt-repository -y ppa:couchdb/stable \
1414
&& apt-add-repository -y ppa:ondrej/php \
15-
&& apt-get update && apt-get -y --no-install-recommends upgrade \
15+
&& apt-get update && apt-get -yf -o Dpkg::Options::="--force-confdef" --no-install-recommends upgrade \
1616
&& apt-get -y --no-install-recommends --allow-unauthenticated install wget curl unzip nano vim rsync apt-transport-https openssh-client openssh-server \
1717
sudo tar git apt-utils software-properties-common build-essential python-dev tcl openssl libpcre3 dnsmasq ca-certificates libpcre3-dev re2c \
1818
libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libssl-dev libmagickwand-dev procps imagemagick netcat pkg-config \
1919
mcrypt pwgen language-pack-en-base libicu-dev g++ cpp libglib2.0-dev incron libcouchbase-dev libcouchbase2-libevent \
2020
libc6 libcurl3 libgcc1 libgssapi-krb5-2 liblttng-ust0 libssl1.0.0 libstdc++6 libunwind8 libuuid1 zlib1g \
21-
php-pear php-xml php7.3-dev php7.3-xml php7.2-dev php7.2-xml php7.1-dev php7.1-xml \
21+
php-pear php-xml php7.3-dev php7.3-xml php7.2-dev php7.2-xml php7.4-dev php7.4-xml \
2222
&& rsync --update -ahp --progress /opt/libv8-7.4/ /usr/local/ \
2323
&& systemctl disable incron \
2424
&& echo 'root' >> /etc/incron.allow \
@@ -28,14 +28,10 @@ RUN cd /tmp \
2828
&& apt-get clean \
2929
&& rm -rf /var/lib/apt/lists/* \
3030
&& rm -f /core \
31-
&& /usr/bin/switch-php.sh "7.1" \
32-
&& pecl -d php_suffix=7.1 install -f --alldeps pcs igbinary couchbase imagick \
33-
&& git clone https://github.com/phpv8/v8js.git /tmp/v8js \
34-
&& cd /tmp/v8js \
35-
&& git checkout php7 && phpize7.1 \
36-
&& ./configure LDFLAGS="-lstdc++" --with-v8js=/opt/libv8-7.4 \
37-
&& make all test install \
38-
&& mkdir -p /mytmp/20160303 && rsync -ahp /usr/lib/php/20160303/ /mytmp/20160303/ \
31+
&& ls -la /usr/lib/php \
32+
&& /usr/bin/switch-php.sh "7.4" \
33+
&& pecl -d php_suffix=7.4 install -f --alldeps imagick \
34+
&& mkdir -p /mytmp/20190902 && rsync -ahp /usr/lib/php/20190902/ /mytmp/20190902/ \
3935
&& rm -rf /tmp/*
4036
RUN /usr/bin/switch-php.sh "7.3" \
4137
&& pecl -d php_suffix=7.3 install -f --alldeps pcs igbinary couchbase imagick \
@@ -53,7 +49,7 @@ RUN /usr/bin/switch-php.sh "7.2" \
5349
&& git checkout php7 && phpize7.2 \
5450
&& ./configure LDFLAGS="-lstdc++" --with-v8js=/opt/libv8-7.4 \
5551
&& make all test install \
56-
&& rsync -ahp /mytmp/20160303/ /usr/lib/php/20160303/ \
52+
&& rsync -ahp /mytmp/20190902/ /usr/lib/php/20190902/ \
5753
&& rsync -ahp /mytmp/20180731/ /usr/lib/php/20180731/ \
5854
&& rm -rf /mytmp \
5955
&& curl -s -o /tmp/python-support_1.0.15_all.deb https://launchpadlibrarian.net/109052632/python-support_1.0.15_all.deb \

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017
3+
Copyright (c) 2020
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ Based off https://github.com/phusion/baseimage-docker, this primarily build to i
55
For convienience, sshd is enabled by default; just don't expose docker port 22 if you don't want to use sshd.
66

77
## php files
8-
1. pecl install latest v8 and v8js for php7.1+
8+
1. pecl install latest v8 and v8js for php7.2+
99
2. pecl install pcs and couchbase for couchdb
1010
3. imagemagick lib for php-imagick support
1111

1212
## add repositories
13-
1. php 7.1+
13+
1. php 7.2+
1414
2. mariadb 10.2
1515
3. mongodb 3.6
1616
4. couchbase and couchdb
1717

1818
## Note
19+
1.5.0 - removed deprecated php7.1 and add php7.4 - note that, pcs, igbinary, couchbase, and v8js are not yet compatible for php7.4
20+
1921
1.4.2 - remove composer
2022

2123
1.4.0 - removed v8 now that we can build v8js in all versions of php

0 commit comments

Comments
 (0)