Commit f89405cb authored by Dave Lane's avatar Dave Lane

working PHP 7.2 configuration

parent c86b0b70
...@@ -13,7 +13,7 @@ RUN apt-get install -y net-tools vim dnsutils ...@@ -13,7 +13,7 @@ RUN apt-get install -y net-tools vim dnsutils
# install cron and msmtp for outgoing email # install cron and msmtp for outgoing email
RUN apt-get install -y cron msmtp RUN apt-get install -y cron msmtp
RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos RUN docker-php-ext-configure imap --with-imap --with-imap-ssl --with-kerberos
RUN docker-php-ext-install bz2 curl imap intl mbstring mcrypt \ RUN docker-php-ext-install bz2 curl imap intl mbstring \
pspell opcache soap xmlrpc zip pspell opcache soap xmlrpc zip
# install PHPRedis # install PHPRedis
...@@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \ ...@@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng-dev \ libpng-dev \
&& docker-php-ext-install -j$(nproc) iconv mcrypt \ && docker-php-ext-install -j$(nproc) iconv \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-install -j$(nproc) gd && docker-php-ext-install -j$(nproc) gd
......
...@@ -4,33 +4,37 @@ set -e ...@@ -4,33 +4,37 @@ set -e
SEMAPH=composer-running SEMAPH=composer-running
if ! [ -f $SEMAPH ] ; then # if it's not already there, install composer.
# create the semaphore file with the date in it... if ! [ -e /usr/local/bin/composer ]; then
echo >&2 "first getting Composer"
# Get Composer
curl -S https://getcomposer.org/installer | php
chmod a+x composer.phar
mv composer.phar /usr/local/bin/composer
fi
if ! [ -e .git/hooks ]; then
echo >&2 "creating a .git/hooks dir to avoid errors"
mkdir -p .git/hooks
fi
if ! [ -f $SEMAPH ] ; then
# create the semaphore file with the date in it...
date > $SEMAPH date > $SEMAPH
# run composer to set up dependencies if not already there... # run composer to set up dependencies if not already there...
if ! [ -e vendor/autoload.php ]; then if ! [ -e vendor/autoload.php ]; then
echo >&2 "installing dependencies with Composer" echo >&2 "installing dependencies with Composer"
if ! [ -e /usr/local/bin/composer ]; then
echo >&2 "first getting Composer"
# Get Composer
curl -S https://getcomposer.org/installer | php
chmod a+x composer.phar
mv composer.phar /usr/local/bin/composer
fi
if ! [ -e .git/hooks ]; then
echo >&2 "creating a .git/hooks dir to avoid errors"
mkdir -p .git/hooks
fi
composer install composer install
else else
echo >&2 "vendor dependencies already in place." echo >&2 "vendor dependencies already in place, updating."
composer update
fi fi
#remove semaphore #remove semaphore
rm $SEMAPH rm $SEMAPH
else else
echo >&2 "Looks like another composer is already running. If not, please remove $SEMAPH" echo >&2 "Looks like another composer is already running. If not, please remove $SEMAPH"
fi fi
exec "$@" exec "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment