Skip to content

Commit ff77902

Browse files
committed
Merge branch 'release/0.2.0'
2 parents 9600382 + 590bdd6 commit ff77902

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

Dockerfile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apk info \
1919
nginx \
2020
zlib-dev \
2121
icu-dev \
22+
imagemagick \
2223
imagemagick-dev \
2324
libzip-dev \
2425
libjpeg-turbo-dev \
@@ -38,22 +39,30 @@ RUN apk info \
3839
xvfb \
3940
chromium@edge \
4041
chromium-chromedriver@edge \
41-
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
42+
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
4243
&& docker-php-ext-install -j$(nproc) \
4344
gd \
4445
pdo_mysql \
4546
zip \
4647
bcmath \
4748
exif \
48-
&& docker-php-ext-install \
4949
intl \
50-
zip \
5150
opcache \
5251
pcntl \
53-
&& pecl install imagick \
54-
&& docker-php-ext-enable imagick \
52+
mbstring \
53+
iconv \
54+
&& pecl install \
55+
redis \
56+
imagick \
57+
&& docker-php-ext-enable \
58+
redis \
59+
imagick \
5560
&& apk del .build-deps
5661

62+
# fix iconv (see https://github.com/docker-library/php/issues/240#issuecomment-305038173)
63+
RUN apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ gnu-libiconv
64+
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
65+
5766
# change default shell
5867
SHELL ["/bin/bash", "-c"]
5968

@@ -96,3 +105,4 @@ RUN find /home/app -name "run-*.sh" -exec chmod -v +x {} \;
96105

97106
# run the application
98107
CMD /home/app/run-dev.sh
108+
EXPOSE 8080

etc/nginx/conf.d/default.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ server {
1212

1313
index index.php index.html;
1414
root /opt/app/public;
15+
charset utf-8;
1516

1617
location / {
1718
try_files $uri /index.php?$args;
1819
}
20+
21+
location = /favicon.ico { access_log off; log_not_found off; }
22+
location = /robots.txt { access_log off; log_not_found off; }
1923

2024
location ~ [^/]\.php(/|$) {
2125
fastcgi_split_path_info ^(.+\.php)(/.+)$;

home/app/run-dev.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
echo "Running via DEV script..."
33
cd /opt/app
44

5-
# Make sure Laravel can write its own files
5+
# make sure Laravel can write its own files
66
mkdir -p /opt/app/storage/logs/
77
touch /opt/app/storage/logs/laravel.log
88
touch /opt/app/storage/logs/worker.log
99
chown www-data:www-data -R /opt/app/storage
1010
chown www-data:www-data -R /opt/app/bootstrap/cache
1111

12+
# create storage symlink
13+
php artisan storage:link
14+
1215
# install dependencies
1316
composer install --prefer-dist --no-progress --no-interaction
1417
yarn

0 commit comments

Comments
 (0)