Commit 98a734a8 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Mise en phase du Dockerfile.sh avec le Dockerfile

parent 0e91792b

Dockerfile.sh

+14 −4
Changes for Dockerfile.sh: 14 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ export APACHE_CONF_DIR=/etc/apache2 
export PHP_CONF_DIR=/etc/php/${PHP_VERSION}



# Mise à niveau de la distrib

echo "Acquire::http::proxy \"${HTTP_PROXY}\";" > /etc/apt/apt.conf.d/05proxy

echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf.d/05proxy

echo "Acquire::https::proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/05proxy

apt -qq update && apt -y full-upgrade



# PHP 7.x PPA repository
@@ -62,7 +63,6 @@ apt -qq update && \ 
        libmemcached-tools \

        netcat-openbsd \

        php-pear \

        php-dev \

        php${PHP_VERSION} \

        php${PHP_VERSION}-bcmath \

        php${PHP_VERSION}-curl \
@@ -83,6 +83,11 @@ apt -qq update && \ 
        php${PHP_VERSION}-xdebug \

        php${PHP_VERSION}-xml \

        php${PHP_VERSION}-zip \

        php${PHP_VERSION}-cli \

        php${PHP_VERSION}-common \

        php${PHP_VERSION}-json \

        php${PHP_VERSION}-opcache \

        php${PHP_VERSION}-readline \

        ssh \

        ssl-cert \

        subversion \
@@ -91,6 +96,9 @@ apt -qq update && \ 
        wget \

        zlib1g-dev



# Forçage de la version de PHP CLI

update-alternatives --set php /usr/bin/php${PHP_VERSION}



# Config PHP.

cp configs/php.conf ${PHP_CONF_DIR}/fpm/conf.d/20-php-unicaen.ini

cp configs/php-opcache.ini ${PHP_CONF_DIR}/fpm/conf.d/20-opcache-unicaen.ini
@@ -112,14 +120,16 @@ echo "/usr/local/instantclient" > /etc/ld.so.conf.d/oracle-instantclient.conf && 


a2enmod actions alias rewrite ssl proxy proxy_fcgi setenvif headers && \

a2dismod mpm_event mpm_prefork && a2enmod mpm_worker

a2enconf php${PHP_VERSION}-fpm

cp configs/apache/security.conf ${APACHE_CONF_DIR}/conf-available/security-unicaen.conf

a2disconf security.conf && \

a2enconf security-unicaen.conf php${PHP_VERSION}-fpm



# Scripts maison

cp scripts/update-satis.sh /usr/local/bin/update-satis

chmod 755 /usr/local/bin/update-satis



# Composer

curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \

curl -sS https://getcomposer.org/installer --proxy "${http_proxy}" | php -- --install-dir=/usr/local/bin --filename=composer && \

composer global require hirak/prestissimo --no-plugins --no-scripts



# Nettoyage