Compare commits

...

8 Commits

Author SHA1 Message Date
David Bomba
bb514e8d06 Merge pull request #232 from turbo124/master
Remove storage:link from image build
2020-11-30 10:00:27 +11:00
David Bomba
2034c6ebff Remove storage:link from image build 2020-11-30 09:56:30 +11:00
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
3 changed files with 4 additions and 6 deletions

View File

@@ -8,7 +8,6 @@ RUN set -eux; \
apk add --no-cache \
curl \
mysql-client \
git \
libarchive-tools; \
mkdir -p /var/www/app
@@ -43,8 +42,6 @@ COPY --from=frontend /var/www/app /var/www/app
COPY entrypoint.sh /usr/local/bin/docker-entrypoint
RUN chmod +x /usr/local/bin/docker-entrypoint
RUN apt-get update && apt-get install -y libonig-dev
RUN set -eux; \
apk add --no-cache \
nodejs \
@@ -55,6 +52,8 @@ RUN set -eux; \
libjpeg-turbo-dev \
libpng-dev \
libzip-dev \
oniguruma-dev \
git \
zip; \
docker-php-ext-configure gd --with-freetype --with-jpeg; \
docker-php-ext-install -j$(nproc) \
@@ -121,7 +120,5 @@ RUN /usr/local/bin/composer install --no-dev --no-suggest --no-progress --quiet
ENV APP_ENV production
ENV LOG errorlog
RUN php artisan storage:link
ENTRYPOINT ["docker-entrypoint"]
CMD ["php-fpm"]

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