From 27842024e1cf1de462393c051a2eacf3cf63b054 Mon Sep 17 00:00:00 2001 From: Andrew Gardener Date: Tue, 16 Feb 2021 17:28:02 -0800 Subject: [PATCH] Add pdo_mysql to dockerfile Also add a few other docker improves (originally in the LTI update branch) --- Dockerfile | 4 ++-- Dockerfile-app-unittest | 4 +++- docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f15f14efe..03555a002 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge && rm -rf /var/lib/apt/lists/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ && ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so \ - && docker-php-ext-install -j$(nproc) xml gd ldap mysqli \ + && docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql intl \ && pecl install timezonedb xdebug\ && docker-php-ext-enable timezonedb xdebug\ && curl https://getcomposer.org/download/1.8.4/composer.phar -o /usr/local/bin/composer \ @@ -21,7 +21,7 @@ COPY . /var/www/html COPY docker/docker-entrypoint-php-fpm.sh / RUN cd /var/www/html \ - && composer install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --no-suggest --optimize-autoloader \ + && composer install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --no-scripts --no-suggest --optimize-autoloader \ && mkdir -p /var/www/html/app/tmp/cache/persistent /var/www/html/app/tmp/cache/models /var/www/html/app/tmp/logs \ && chown www-data:www-data -R /var/www/html/app/tmp/cache \ && chown www-data:www-data -R /var/www/html/app/tmp/logs diff --git a/Dockerfile-app-unittest b/Dockerfile-app-unittest index 588eea5c3..6204505bc 100644 --- a/Dockerfile-app-unittest +++ b/Dockerfile-app-unittest @@ -12,9 +12,11 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge && rm -rf /var/lib/apt/lists/* \ && ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \ && ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so \ - && docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql\ + && docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql intl \ && pecl install timezonedb \ && docker-php-ext-enable timezonedb \ + && pecl install xdebug \ + && docker-php-ext-enable xdebug \ && curl https://getcomposer.org/download/1.8.4/composer.phar -o /usr/local/bin/composer \ && chmod +x /usr/local/bin/composer \ && pecl install -f oauth-2.0.2 \ diff --git a/docker-compose.yml b/docker-compose.yml index 0fcc614f7..4422bfa06 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: db: - image: mariadb:10.4 + image: mariadb:10.5 container_name: ipeer_db environment: - MYSQL_ROOT_PASSWORD=randompassword