From 0cb27de924d7f9e0e7bf1c8905487c06fde8829c Mon Sep 17 00:00:00 2001 From: bkraul Date: Fri, 1 Nov 2019 06:54:37 -0500 Subject: [PATCH] Removed imagick install (now provided by upstream 7.3) --- 7.3/Dockerfile | 6 ++---- README.md | 4 ++-- ubuntu-14.04-samba/Dockerfile | 10 ++++++++++ ubuntu-14.04-samba/build | 6 ++++++ ubuntu-14.04-samba/push | 4 ++++ 5 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 ubuntu-14.04-samba/Dockerfile create mode 100755 ubuntu-14.04-samba/build create mode 100755 ubuntu-14.04-samba/push diff --git a/7.3/Dockerfile b/7.3/Dockerfile index c1751af..c7d6d2f 100644 --- a/7.3/Dockerfile +++ b/7.3/Dockerfile @@ -13,23 +13,21 @@ RUN set -x \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bash_profile \ && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc \ && /bin/bash -c "source ~/.bashrc" \ - && apt-install libmcrypt-dev libmagickwand-dev \ + && apt-install libmcrypt-dev \ # install the pecl extensions && pecl install mcrypt-1.0.2 \ && pecl install sqlsrv \ && pecl install pdo_sqlsrv \ && pecl install igbinary \ - && pecl install imagick \ && pecl install msgpack \ && echo extension=mcrypt.so > /usr/local/etc/php/conf.d/20-mcrypt.ini \ && echo extension=pdo_sqlsrv.so > /usr/local/etc/php/conf.d/30-pdo_sqlsrv.ini \ && echo extension=sqlsrv.so > /usr/local/etc/php/conf.d/20-sqlsrv.ini \ && echo extension=igbinary.so > /usr/local/etc/php/conf.d/20-igbinary.ini \ - && echo extension=imagick.so > /usr/local/etc/php/conf.d/20-imagick.ini \ && echo extension=msgpack.so > /usr/local/etc/php/conf.d/20-msgpack.ini \ # uninstall all headers and libraries && apt-get purge -y -f --force-yes \ - libmcrypt-dev libmagickwand-dev unixodbc-dev \ + libmcrypt-dev unixodbc-dev \ # perform image cleanup. && docker-run-bootstrap \ && docker-image-cleanup diff --git a/README.md b/README.md index b832707..f083d08 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ This image is based on [webdevops/php-nginx](https://hub.docker.com/r/webdevops/ | Tags | PHP Version | Distribution | | -------------------- | ----------- | ----------------------- | -| latest, ubuntu-18.04 | 7.2.15 | Ubuntu 18.04.1 (bionic) | -| 7.3 | 7.3.2 | Debian 10 (buster) | +| latest, ubuntu-18.04 | 7.2.24 | Ubuntu 18.04.1 (bionic) | +| 7.3 | 7.3.11 | Debian 10 (buster) | # Usage diff --git a/ubuntu-14.04-samba/Dockerfile b/ubuntu-14.04-samba/Dockerfile new file mode 100644 index 0000000..e181b73 --- /dev/null +++ b/ubuntu-14.04-samba/Dockerfile @@ -0,0 +1,10 @@ +FROM webdevops/php-nginx:ubuntu-14.04 +MAINTAINER Belman Kraul + +RUN set -x \ + && apt update \ + # install pre-requisites. + && apt install smbclient samba-common -y \ + # perform image cleanup. + && docker-run-bootstrap \ + && docker-image-cleanup diff --git a/ubuntu-14.04-samba/build b/ubuntu-14.04-samba/build new file mode 100755 index 0000000..7111901 --- /dev/null +++ b/ubuntu-14.04-samba/build @@ -0,0 +1,6 @@ +#!/bin/sh + +docker pull webdevops/php-nginx:ubuntu-14.04 +docker build $1\ + -t bkraul/php-nginx:ubuntu-14.04-samba \ + . diff --git a/ubuntu-14.04-samba/push b/ubuntu-14.04-samba/push new file mode 100755 index 0000000..1fb2adf --- /dev/null +++ b/ubuntu-14.04-samba/push @@ -0,0 +1,4 @@ +#!/bin/sh + +docker push bkraul/php-nginx:ubuntu-14.04-samba +