Skip to content

Commit

Permalink
Merge pull request #292 from EscolaLMS/develop
Browse files Browse the repository at this point in the history
excimer.so
  • Loading branch information
qunabu authored Jul 27, 2023
2 parents b67d0a5 + 55d79a2 commit 566f8c2
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

services:
mysql:
image: mariadb
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: password
MYSQL_DATABASE: test
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RUN apt install -y debian-keyring debian-archive-keyring apt-transport-https \
&& curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg \
&& curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
RUN apt-get update && apt-get install caddy -y
RUN pecl install excimer
RUN cp docker/envs/.env.postgres.prod /var/www/html/.env \
&& cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
&& cp docker/conf/supervisor/caddy.conf /etc/supervisor/custom.d/caddy.conf \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.develop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RUN apt install -y debian-archive-keyring apt-transport-https \
&& curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg \
&& curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list
RUN apt-get update && apt-get install caddy -y
RUN pecl install excimer
RUN cp docker/envs/.env.postgres.develop /var/www/html/.env \
&& cp docker/conf/supervisor/supervisord.conf /etc/supervisor/supervisord.conf \
&& cp docker/conf/supervisor/caddy.conf /etc/supervisor/custom.d/caddy.conf \
Expand Down
2 changes: 2 additions & 0 deletions docker/conf/php/xxx-devilbox-default-php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@ html_errors = On
;xdebug.var_display_max_depth=10
;xdebug.client_host=10.254.254.254
;xdebug.discover_client_host=1

extension=excimer.so

0 comments on commit 566f8c2

Please sign in to comment.