diff --git a/.env b/.env index dcdedf5..3739625 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -COMPOSE_PROJECT_NAME=grav_figureslibres.cc +COMPOSE_PROJECT_NAME=figureslibres.cc PROJECT_ROOT=./public_html LOG_ROOT=./log diff --git a/Docker/php/Dockerfile b/Docker/php/Dockerfile index ac5b37c..f85b94d 100644 --- a/Docker/php/Dockerfile +++ b/Docker/php/Dockerfile @@ -1,23 +1,30 @@ -FROM php:7.0-fpm - -COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini +FROM php:7.3-fpm RUN apt-get update && apt-get install -y \ libfreetype6-dev \ libjpeg62-turbo-dev \ libmcrypt-dev \ libpng-dev \ - libzip-dev \ - zip && \ - docker-php-ext-install -j$(nproc) iconv mcrypt && \ + zip \ + libzip-dev && \ + # docker-php-ext-install -j$(nproc) iconv && \ docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \ + apt-get install -y imagemagick libmagickwand-dev && \ + pecl install imagick && docker-php-ext-enable imagick && \ docker-php-ext-install -j$(nproc) gd && \ - docker-php-ext-install opcache && \ - docker-php-ext-configure zip --with-libzip && \ docker-php-ext-install zip && \ + docker-php-ext-install opcache && \ + docker-php-ext-install bcmath && \ apt-get install -y git vim && \ - pecl install xdebug-2.5.0 && \ - docker-php-ext-enable xdebug + pecl install redis-4.3.0 && \ + pecl install xdebug-2.7.0 && \ + docker-php-ext-enable redis xdebug RUN export COMPOSER_HOME=/usr/local/composer && \ - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + curl -sS https://getcomposer.org/installer \ + | php -- --install-dir=/usr/local/bin --filename=composer + +COPY ./php-custom.ini /usr/local/etc/php/conf.d/php-custom.ini + +COPY ./bashrc /root/.bashrc +COPY ./inputrc /root/.inputrc diff --git a/Docker/php/bashrc b/Docker/php/bashrc new file mode 100644 index 0000000..70f55f9 --- /dev/null +++ b/Docker/php/bashrc @@ -0,0 +1,4 @@ + +PS1='\e[36m\e[1mPHP-7.3\e[0m:\e[90m\w\e[0m\n$ ' +bind '"\e[A": history-search-backward' +bind '"\e[B": history-search-forward' diff --git a/Docker/php/inputrc b/Docker/php/inputrc new file mode 100644 index 0000000..db8d91d --- /dev/null +++ b/Docker/php/inputrc @@ -0,0 +1,2 @@ +set show-all-if-ambiguous on +set completion-ignore-case on diff --git a/public_html b/public_html index 3791a9f..2987210 160000 --- a/public_html +++ b/public_html @@ -1 +1 @@ -Subproject commit 3791a9f435207665e6d797f576b38c2567c57d73 +Subproject commit 2987210451242feeb016d7f7c09d4f588f4eacd9