Compare commits

...

10 Commits

Author SHA1 Message Date
David Bomba
65e36505a3 Merge pull request #231 from turbo124/master
Minor fixes
2020-11-28 18:07:34 +11:00
David Bomba
03c1e32123 Minor fixes 2020-11-28 18:07:16 +11:00
David Bomba
3612c87323 Merge pull request #230 from turbo124/master
Default to puppeteer PDF generation
2020-11-28 17:51:04 +11:00
David Bomba
4e9731a23e Default to puppeteer PDF generation 2020-11-28 17:50:46 +11:00
David Bomba
dea442c442 Merge pull request #229 from turbo124/master
Install libonig-dev with apk
2020-11-28 17:26:33 +11:00
David Bomba
a24c1b98a3 Install libonig-dev with apk 2020-11-28 17:26:13 +11:00
David Bomba
1596478724 Merge pull request #228 from turbo124/master
Install libonig-dev with apt
2020-11-28 17:20:28 +11:00
David Bomba
a240fd2977 Install libonig-dev with apt 2020-11-28 17:20:09 +11:00
David Bomba
7c1ef67755 Merge pull request #227 from turbo124/master
fixes for 7.4
2020-11-28 17:15:14 +11:00
David Bomba
bfc1d7add8 fixes for 7.4 2020-11-28 17:14:57 +11:00
3 changed files with 4 additions and 4 deletions

View File

@@ -8,8 +8,6 @@ RUN set -eux; \
apk add --no-cache \
curl \
mysql-client \
git \
libonig-dev \
libarchive-tools; \
mkdir -p /var/www/app
@@ -54,7 +52,8 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
libonig-dev \
oniguruma-dev \
git \
zip; \
docker-php-ext-configure gd --with-freetype --with-jpeg; \
docker-php-ext-install -j$(nproc) \

View File

@@ -1,6 +1,6 @@
server {
listen 80 default_server;
server_name in.localhost;
server_name _ in.localhost;
root /var/www/app/public/;
index index.php;

View File

@@ -40,6 +40,7 @@ services:
- DB_USERNAME1=ninja
- DB_PASSWORD1=ninja
- DB_DATABASE1=ninja
- PHANTOMJS_PDF_GENERATION=false
volumes:
# Configure your mounted directories, make sure the folder 'public' and 'storage'
# exist, before mounting them