Merge pull request #36 from docksal/feature/php-extension-updates

PHP extension updates
docksal · Mar 21, 2018 · 0c07ef9 · 0c07ef9
2 parents c81eea5 + 58ab40f
commit 0c07ef9
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 83 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -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 \
@@ -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 \
 	;\

diff --git a/5.6/php-modules.txt b/5.6/php-modules.txt
@@ -7,7 +7,6 @@ Core
 ctype
 curl
 date
-dba
 dom
 ereg
 exif
@@ -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

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -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; \
@@ -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 \
@@ -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 \
 	;\
@@ -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; \

diff --git a/7.0/php-modules.txt b/7.0/php-modules.txt
@@ -7,7 +7,6 @@ Core
 ctype
 curl
 date
-dba
 dom
 exif
 fileinfo
@@ -19,6 +18,7 @@ gnupg
 hash
 iconv
 imagick
+imap
 intl
 json
 ldap
@@ -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