Commit 0ceeee98 authored by Dave Lane's avatar Dave Lane

latest updates, fixing permissions

parent 828e5e14
......@@ -8,14 +8,14 @@ ENV DEBIAN_FRONTEND="noninteractive"
# Install PHP extensions
RUN apt-get update && apt-get install -y apt-utils git less libbz2-dev libc-client-dev \
libcurl4-gnutls-dev libicu-dev libkrb5-dev libmcrypt-dev libpng-dev \
libpspell-dev libssl-dev libxml2-dev mariadb-client telnet unzip zip
libpspell-dev libssl-dev libxml2-dev libzip-dev mariadb-client telnet unzip zip
RUN apt-get install -y net-tools vim dnsutils
# install cron and msmtp for outgoing email
RUN apt-get install -y cron msmtp sudo
RUN apt-get install -y --no-install-recommends libpq-dev
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 \
RUN docker-php-ext-install bz2 curl imap intl mbstring mysqli \
pspell opcache pdo pdo_mysql pdo_pgsql pspell soap xmlrpc zip
# install PHPRedis
......@@ -42,11 +42,19 @@ RUN apt-get update && apt-get install -y \
# install APCU and YAML
RUN apt-get install -y \
libyaml-dev unzip
RUN pecl install yaml-2.0.0
RUN pecl install yaml-2.0.4
RUN docker-php-ext-enable yaml
RUN pecl install apcu
RUN docker-php-ext-enable apcu
# install exif libraries required by piwigo
RUN docker-php-ext-install exif
# install stuff for piwigo
RUN apt-get update && apt-get install -y \
exiftool ffmpeg mediainfo
# clean up all Apt stuff
RUN rm -rf /var/lib/apt/lists/*
......
......@@ -11,6 +11,8 @@ if ! [ -e /usr/local/bin/composer ]; then
curl -S https://getcomposer.org/installer | php
chmod a+x composer.phar
mv composer.phar /usr/local/bin/composer
mkdir /var/www/.composer
chown -R www-data /var/www/.composer
fi
if ! [ -e .git/hooks ]; then
echo >&2 "creating a .git/hooks dir to avoid errors"
......@@ -25,10 +27,10 @@ if ! [ -f $SEMAPH ] ; then
# run composer to set up dependencies if not already there...
if ! [ -e vendor/autoload.php ]; then
echo >&2 "installing dependencies with Composer"
composer install
sudo -u www-data composer install
else
echo >&2 "vendor dependencies already in place, updating."
composer update
sudo -u www-data composer update
fi
#remove semaphore
......
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