From 31435904c1970d1a642d83f2f5d511c7ee87ba86 Mon Sep 17 00:00:00 2001 From: Tema Smirnov Date: Tue, 17 Mar 2020 05:23:07 +0300 Subject: [PATCH] Added `sockets` extension `sockets` extension is required by php-amqplib (PHP client for RabbitMQ) Signed-off-by: Tema Smirnov --- 5.4/Dockerfile | 2 +- 5.4/apache/Dockerfile | 2 +- 5.4/fpm/Dockerfile | 2 +- 5.5/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.5/fpm/Dockerfile | 2 +- 5.6/Dockerfile | 3 ++- 5.6/apache/Dockerfile | 1 + 5.6/fpm/Dockerfile | 3 ++- 7.0/Dockerfile | 3 ++- 7.0/apache/Dockerfile | 1 + 7.0/fpm/Dockerfile | 3 ++- 7.1/Dockerfile | 3 ++- 7.1/apache/Dockerfile | 1 + 7.1/fpm/Dockerfile | 3 ++- 7.2/Dockerfile | 3 ++- 7.2/apache/Dockerfile | 1 + 7.2/fpm/Dockerfile | 3 ++- 7.3/Dockerfile | 3 ++- 7.3/apache/Dockerfile | 1 + 7.3/fpm/Dockerfile | 3 ++- 7.4/Dockerfile | 3 ++- 7.4/apache/Dockerfile | 1 + 7.4/fpm/Dockerfile | 3 ++- Dockerfile | 3 ++- Makefile | 7 ++++--- README.md | 1 + dev/Makefile | 3 ++- 28 files changed, 45 insertions(+), 23 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index f9dd141..d97b9c1 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 9d6278d..a8e5ac0 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 2fec89a..018fa9c 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 494d288..b4e92a2 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index eed2cfd..fb11004 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 5af8efb..1b95c57 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -23,7 +23,7 @@ RUN buildDeps=" \ libxslt1-dev \ " \ && apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y $buildDeps $runtimeDeps \ - && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip \ + && docker-php-ext-install bcmath bz2 calendar iconv intl mbstring mcrypt mysql mysqli opcache pdo_mysql pdo_pgsql pgsql soap xsl zip sockets \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ \ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 94f957d..7965c69 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -29,7 +29,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index c17ee1b..5607954 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -30,6 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index f8a3d12..7bd30c2 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -29,7 +29,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index e44d90e..12a0975 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -28,7 +28,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index fd59d5d..d4a030e 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -29,6 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 1db192b..c105d91 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -28,7 +28,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.1/Dockerfile b/7.1/Dockerfile index f2af2c1..7e0a1b2 100644 --- a/7.1/Dockerfile +++ b/7.1/Dockerfile @@ -28,7 +28,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile index feca135..c90d9af 100644 --- a/7.1/apache/Dockerfile +++ b/7.1/apache/Dockerfile @@ -29,6 +29,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index e862e48..8d8e710 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -28,7 +28,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.2/Dockerfile b/7.2/Dockerfile index 738d454..51bff4e 100644 --- a/7.2/Dockerfile +++ b/7.2/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.2/apache/Dockerfile b/7.2/apache/Dockerfile index 27e8fd2..ac4b2d9 100644 --- a/7.2/apache/Dockerfile +++ b/7.2/apache/Dockerfile @@ -28,6 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/7.2/fpm/Dockerfile b/7.2/fpm/Dockerfile index d078d5a..5261824 100644 --- a/7.2/fpm/Dockerfile +++ b/7.2/fpm/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.3/Dockerfile b/7.3/Dockerfile index 3bc40ee..a85b03c 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.3/apache/Dockerfile b/7.3/apache/Dockerfile index 8e43db6..8201184 100644 --- a/7.3/apache/Dockerfile +++ b/7.3/apache/Dockerfile @@ -28,6 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/7.3/fpm/Dockerfile b/7.3/fpm/Dockerfile index e12af71..cc864cb 100644 --- a/7.3/fpm/Dockerfile +++ b/7.3/fpm/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.4/Dockerfile b/7.4/Dockerfile index 5766547..2a35bb7 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/7.4/apache/Dockerfile b/7.4/apache/Dockerfile index 4aa7cb6..52e87ba 100644 --- a/7.4/apache/Dockerfile +++ b/7.4/apache/Dockerfile @@ -28,6 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ soap \ xsl \ zip \ + sockets \ # already installed: # iconv \ # mbstring \ diff --git a/7.4/fpm/Dockerfile b/7.4/fpm/Dockerfile index f53a55b..d4b6812 100644 --- a/7.4/fpm/Dockerfile +++ b/7.4/fpm/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/Dockerfile b/Dockerfile index 6d4a119..3df8789 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q \ redis \ soap \ xsl \ - zip + zip \ + sockets # already installed: # iconv \ # mbstring \ diff --git a/Makefile b/Makefile index 9617373..e059051 100644 --- a/Makefile +++ b/Makefile @@ -25,9 +25,10 @@ EXTENSIONS := \ pdo_pgsql \ pgsql \ redis \ - soap \ - xsl \ - zip + soap \ + xsl \ + zip \ + sockets ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 latest)) # Add more extensions to PHP < 7.2. EXTENSIONS += mcrypt diff --git a/README.md b/README.md index b3e2606..dbeb286 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ in addition to those you can already find in the [official PHP image](https://hu - `xsl` - `Zend OPcache` - `zip` +- `sockets` You will probably not need all this stuff. Even if having some extra extensions loaded ain't a big issue in most cases, you will very likely want to checkout this repository, remove unwanted extensions from the `Dockerfile`, and build your own image — for sometimes removing is easier than adding. 😉 diff --git a/dev/Makefile b/dev/Makefile index a4fb347..2ebef98 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -27,7 +27,8 @@ EXTENSIONS := \ redis \ soap \ Xdebug \ - zip + zip \ + sockets ifeq (,$(findstring $(PHP_VERSION), 7.2 7.3 7.4 latest)) # Add more extensions to PHP < 7.2. EXTENSIONS += mcrypt