Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP extension updates #36

Merged
merged 8 commits into from
Mar 21, 2018
Merged

PHP extension updates #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d23d51
Removed archaic/not used PHP extensions
lmakarov Mar 20, 2018
0c71e85
Remove mysql extension
lmakarov Mar 20, 2018
edde640
Put xdebug back for 7.2
lmakarov Mar 20, 2018
e0e311b
Added pgsql PHP extension (#31)
lmakarov Mar 20, 2018
d2f57cc
Cleanup output in tests
lmakarov Mar 21, 2018
da65bd3
Added imap PHP extension
lmakarov Mar 21, 2018
9ad9b8f
Added MSSQL support. Closes #35
lmakarov Mar 21, 2018
58ab40f
Use tee instead of redirect
lmakarov Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions 5.6/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,28 @@ ENV NOTVISIBLE "in users profile"
RUN set -xe; \
buildDeps=" \
g++ \
libc-client2007e-dev \
libfreetype6-dev \
libgpgme11-dev \
libicu-dev \
libjpeg62-turbo-dev \
libkrb5-dev \
libldap2-dev \
libmagickcore-dev \
libmagickwand-dev \
libmcrypt-dev \
libmemcached-dev \
libmhash-dev \
libpng12-dev \
libpq-dev \
libssh2-1-dev \
libxslt1-dev \
zlib1g-dev \
"; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
$buildDeps \
blackfire-php \
libc-client2007e \
libfreetype6 \
libgpgme11 \
libicu52 \
Expand All @@ -140,37 +144,35 @@ RUN set -xe; \
libmcrypt4 \
libmhash2 \
libpng12-0 \
libpq5 \
libssh2-1 \
libxslt1.1 \
zlib1g \
;\
docker-php-ext-configure >/dev/null hash --with-mhash; \
docker-php-ext-configure >/dev/null gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
docker-php-ext-configure >/dev/null imap --with-kerberos --with-imap-ssl; \
docker-php-ext-configure >/dev/null ldap --with-libdir=lib/x86_64-linux-gnu/; \
docker-php-ext-configure >/dev/null pgsql --with-pgsql=/usr/local/pgsql/; \
\
docker-php-ext-install >/dev/null -j$(nproc) \
bcmath \
bz2 \
calendar\
dba \
exif \
gd \
gettext \
imap \
intl \
ldap \
mcrypt \
mysqli \
opcache \
pcntl \
mysql \
mysqli \
pdo_mysql \
shmop \
pdo_pgsql \
pgsql \
soap \
sockets \
sysvmsg \
sysvsem \
sysvshm \
wddx \
xsl \
zip \
;\
Expand Down
10 changes: 3 additions & 7 deletions 5.6/php-modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Core
ctype
curl
date
dba
dom
ereg
exif
Expand All @@ -20,41 +19,38 @@ gnupg
hash
iconv
imagick
imap
intl
json
ldap
libxml
mbstring
mcrypt
memcache
mysql
mysqli
mysqlnd
openssl
pcntl
pcre
PDO
pdo_mysql
pdo_pgsql
pdo_sqlite
pgsql
Phar
posix
readline
redis
Reflection
session
shmop
SimpleXML
soap
sockets
SPL
sqlite3
ssh2
standard
sysvmsg
sysvsem
sysvshm
tokenizer
wddx
xml
xmlreader
xmlwriter
Expand Down
47 changes: 31 additions & 16 deletions 7.0/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,21 @@ ENV LC_ALL C.UTF-8
# Enable additional repos
RUN set -xe; \
sed -i 's/main/main contrib non-free/' /etc/apt/sources.list; \
# Include backports
# backports repo
echo "deb http://ftp.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/backports.list; \
# Include blackfire.io repo
# blackfire.io repo
curl -sSL https://packagecloud.io/gpg.key | apt-key add -; \
echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list; \
# Include git-lfs repo
# git-lfs repo
curl -sSL https://packagecloud.io/github/git-lfs/gpgkey | apt-key add -; \
echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' > /etc/apt/sources.list.d/github_git-lfs.list; \
echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' >> /etc/apt/sources.list.d/github_git-lfs.list; \
# Including yarn repo
echo 'deb https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee /etc/apt/sources.list.d/github_git-lfs.list; \
echo 'deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main' | tee -a /etc/apt/sources.list.d/github_git-lfs.list; \
# yarn repo
curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -; \
echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list; \
# MSQSQL repo
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | apt-key add -; \
echo 'deb https://packages.microsoft.com/debian/8/prod jessie main' | tee /etc/apt/sources.list.d/mssql.list;

# Additional packages
RUN set -xe; \
Expand Down Expand Up @@ -112,24 +115,32 @@ ENV NOTVISIBLE "in users profile"
RUN set -xe; \
buildDeps=" \
g++ \
libc-client2007e-dev \
libfreetype6-dev \
libgpgme11-dev \
libicu-dev \
libjpeg62-turbo-dev \
libkrb5-dev \
libldap2-dev \
libmagickcore-dev \
libmagickwand-dev \
libmcrypt-dev \
libmemcached-dev \
libmhash-dev \
libpng12-dev \
libpq-dev \
libssh2-1-dev \
libxslt1-dev \
unixodbc-dev \
zlib1g-dev \
"; \
apt-get update >/dev/null; apt-get -y --force-yes --no-install-recommends install >/dev/null \
apt-get update >/dev/null; \
# Necessary for msodbcsql17 (MSSQL)
ACCEPT_EULA=Y \
apt-get -y --force-yes --no-install-recommends install >/dev/null \
$buildDeps \
blackfire-php \
libc-client2007e \
libfreetype6 \
libgpgme11 \
libicu52 \
Expand All @@ -142,40 +153,40 @@ RUN set -xe; \
libmemcachedutil2 \
libmhash2 \
libpng12-0 \
libpq5 \
libssh2-1 \
libxslt1.1 \
msodbcsql17 \
zlib1g \
;\
# SSH2 must be installed from source
git clone https://github.com/php/pecl-networking-ssh2.git /usr/src/php/ext/ssh2 && rm -rf /usr/src/php/ext/ssh2/.git; \
\
docker-php-ext-configure >/dev/null hash --with-mhash; \
docker-php-ext-configure >/dev/null gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
docker-php-ext-configure >/dev/null imap --with-kerberos --with-imap-ssl; \
docker-php-ext-configure >/dev/null ldap --with-libdir=lib/x86_64-linux-gnu/; \
docker-php-ext-configure >/dev/null pgsql --with-pgsql=/usr/local/pgsql/; \
\
docker-php-ext-install >/dev/null -j$(nproc) \
bcmath \
bz2 \
calendar\
dba \
exif \
gd \
gettext \
imap \
intl \
ldap \
mcrypt \
mysqli \
opcache \
pcntl \
mysqli \
pdo_mysql \
shmop \
pdo_pgsql \
pgsql \
soap \
sockets \
ssh2 \
sysvmsg \
sysvsem \
sysvshm \
wddx \
xsl \
zip \
;\
Expand All @@ -185,14 +196,18 @@ RUN set -xe; \
imagick \
# Use memcached (not memcache) for PHP 7.x
memcached \
pdo_sqlsrv \
redis \
sqlsrv \
xdebug \
;\
docker-php-ext-enable \
gnupg \
imagick \
memcached \
pdo_sqlsrv \
redis \
sqlsrv \
;\
# Disable xdebug by default
rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini; \
Expand Down
11 changes: 5 additions & 6 deletions 7.0/php-modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Core
ctype
curl
date
dba
dom
exif
fileinfo
Expand All @@ -19,6 +18,7 @@ gnupg
hash
iconv
imagick
imap
intl
json
ldap
Expand All @@ -33,26 +33,25 @@ pcntl
pcre
PDO
pdo_mysql
pdo_pgsql
pdo_sqlite
pdo_sqlsrv
pgsql
Phar
posix
readline
redis
Reflection
session
shmop
SimpleXML
soap
sockets
SPL
sqlite3
sqlsrv
ssh2
standard
sysvmsg
sysvsem
sysvshm
tokenizer
wddx
xml
xmlreader
xmlwriter
Expand Down
Loading