Skip to content

Commit 2784202

Browse files
Add pdo_mysql to dockerfile
Also add a few other docker improves (originally in the LTI update branch)
1 parent 0330abf commit 2784202

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
1010
&& rm -rf /var/lib/apt/lists/* \
1111
&& ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \
1212
&& ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so \
13-
&& docker-php-ext-install -j$(nproc) xml gd ldap mysqli \
13+
&& docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql intl \
1414
&& pecl install timezonedb xdebug\
1515
&& docker-php-ext-enable timezonedb xdebug\
1616
&& curl https://getcomposer.org/download/1.8.4/composer.phar -o /usr/local/bin/composer \
@@ -21,7 +21,7 @@ COPY . /var/www/html
2121
COPY docker/docker-entrypoint-php-fpm.sh /
2222

2323
RUN cd /var/www/html \
24-
&& composer install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --no-suggest --optimize-autoloader \
24+
&& composer install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --no-scripts --no-suggest --optimize-autoloader \
2525
&& mkdir -p /var/www/html/app/tmp/cache/persistent /var/www/html/app/tmp/cache/models /var/www/html/app/tmp/logs \
2626
&& chown www-data:www-data -R /var/www/html/app/tmp/cache \
2727
&& chown www-data:www-data -R /var/www/html/app/tmp/logs

Dockerfile-app-unittest

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
1212
&& rm -rf /var/lib/apt/lists/* \
1313
&& ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \
1414
&& ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so \
15-
&& docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql\
15+
&& docker-php-ext-install -j$(nproc) xml gd ldap mysqli pdo_mysql intl \
1616
&& pecl install timezonedb \
1717
&& docker-php-ext-enable timezonedb \
18+
&& pecl install xdebug \
19+
&& docker-php-ext-enable xdebug \
1820
&& curl https://getcomposer.org/download/1.8.4/composer.phar -o /usr/local/bin/composer \
1921
&& chmod +x /usr/local/bin/composer \
2022
&& pecl install -f oauth-2.0.2 \

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
db:
4-
image: mariadb:10.4
4+
image: mariadb:10.5
55
container_name: ipeer_db
66
environment:
77
- MYSQL_ROOT_PASSWORD=randompassword

0 commit comments

Comments
 (0)