diff --git a/dockerfiles/tasks/php/Dockerfile-7.3 b/dockerfiles/tasks/php/Dockerfile-7.3 index 1c9bc0b..d10fff2 100644 --- a/dockerfiles/tasks/php/Dockerfile-7.3 +++ b/dockerfiles/tasks/php/Dockerfile-7.3 @@ -1,18 +1,31 @@ -FROM php:7.3-fpm +# Create a base Ubuntu image to build upon +# docker build --rm -f Dockerfile-71 -t composer:7.1 . +FROM ubuntu:16.04 MAINTAINER Richard Morgan WORKDIR /opt/project -#CMD ["/usr/sbin/php-fpm7.3", "-F"] +EXPOSE 9000 -COPY ./docker-php-fpm.conf /etc/php/7.3fpm/pool.d/www.conf +# set terminal variable so that tools such as nano and htop work +# this is not needed in prod containers, but is useful for devs +ENV TERM=xterm +RUN apt-get update && apt-get install -y software-properties-common python-software-properties \ + && LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php \ + && apt-get update && apt-get install -y \ + curl nano sed libwww-perl htop ca-certificates \ + php7.3 php7.3-cli php7.3-fpm php7.3-curl php-pear php7.3-zip php7.3-mbstring php7.3-xml \ + php7.3-mysql php7.3-pgsql php7.3-redis \ + php-mcrypt \ + \ + && apt-cache pkgnames | grep php7.3 \ + && rm /usr/bin/php && ln -s /usr/bin/php7.3 /usr/bin/php \ + && ln -s /usr/sbin/php-fpm7.3 /usr/sbin/php-fpm \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN pecl install redis-5.1.1 \ - && pecl install memcached-3.1.5 \ - && pecl install apcu-5.1.18 \ - && docker-php-ext-enable redis memcached apcu +COPY ./docker-php-fpm.conf /etc/php/7.3/fpm/pool.d/www.conf -RUN docker-php-ext-install mysql pgsql cli curl mcrypt zip mbstring xml +CMD ["/usr/sbin/php-fpm7.3", "-F"] -RUN docker-php-ext-enable mysql pgsql cli curl mcrypt zip mbstring xml +#php7.3-mcrypt diff --git a/dockerfiles/tasks/php/Dockerfile-7.3-dev b/dockerfiles/tasks/php/Dockerfile-7.3-dev index 36c335c..d359e25 100644 --- a/dockerfiles/tasks/php/Dockerfile-7.3-dev +++ b/dockerfiles/tasks/php/Dockerfile-7.3-dev @@ -1,22 +1,13 @@ -FROM dkregistry.xai-corp.net:5000/xaicorp/php:7.3 +# Create a base Ubuntu image to build upon +FROM xaicorp/php:7.3 MAINTAINER Richard Morgan -WORKDIR /opt/project - -#CMD ["/usr/sbin/php-fpm7.3", "-F"] - -COPY ./docker-php-fpm.conf /usr/local/etc/php-fpm.d/www.conf - -RUN apt-get update && apt-get install -y curl nano sed git zip \ - && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -RUN pecl install redis-5.1.1 \ - && pecl install xdebug-2.9.4 \ - && docker-php-ext-enable redis xdebug - -RUN echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \ - && echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini \ - && echo "xdebug.remote_port = 9001" >> /usr/local/etc/php/conf.d/xdebug.ini \ - && echo "xdebug.max_nesting_level=300" >> /usr/local/etc/php/conf.d/xdebug.ini \ - && echo "xdebug.remote_connect_back=1" >> /usr/local/etc/php/conf.d/xdebug.ini \ +RUN apt-get update && apt-get install -y \ + php-xdebug \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && echo "xdebug.remote_enable=on" >> /etc/php/7.3/mods-available/xdebug.ini \ + && echo "xdebug.remote_autostart=on" >> /etc/php/7.3/mods-available/xdebug.ini \ + && echo "xdebug.remote_port = 9001" >> /etc/php/7.3/mods-available/xdebug.ini \ + && echo "xdebug.max_nesting_level=300" >> /etc/php/7.3/mods-available/xdebug.ini \ + && echo "xdebug.remote_connect_back=1" >> /etc/php/7.3/mods-available/xdebug.ini \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/dockerfiles/tasks/php/build.sh b/dockerfiles/tasks/php/build.sh index 54a6068..2414594 100755 --- a/dockerfiles/tasks/php/build.sh +++ b/dockerfiles/tasks/php/build.sh @@ -54,16 +54,16 @@ final() { } trap final EXIT -build 7.0 -build_dev 7.0 - +#build 7.0 +#build_dev 7.0 +# build 7.1 build_dev 7.1 build 7.2 build_dev 7.2 -#build 7.3 -#build_dev 7.3 +build 7.3 +build_dev 7.3 exit