Merge pull request #233 from turbo124/master

fixes for docker file

alpine/Dockerfile_v5

@@ -8,7 +8,6 @@ RUN set -eux; \
     apk add --no-cache \
     curl \
     mysql-client \
-    git \
     libarchive-tools; \
     mkdir -p /var/www/app
 
@@ -19,7 +18,6 @@ RUN curl -o /tmp/ninja.tar.gz -LJ0 https://github.com/invoiceninja/invoiceninja/
     && cp -R /var/www/app/public /var/www/app/docker-backup-public  \
     && mkdir -p /var/www/app/public/logo /var/www/app/storage \
     && cp /var/www/app/.env.example /var/www/app/.env \
-    && cp /var/www/app/.env.dusk.example /var/www/app/.env.dusk.local \
     && rm -rf /var/www/app/docs /var/www/app/tests
 
 # Install nodejs packages
@@ -53,14 +51,16 @@ RUN set -eux; \
     libjpeg-turbo-dev \
     libpng-dev \
     libzip-dev \
+    oniguruma-dev \
+    git \
     zip; \
-    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/; \
+    docker-php-ext-configure gd --with-freetype --with-jpeg; \
     docker-php-ext-install -j$(nproc) \
         bcmath \
         exif \
         gd \
         gmp \
-        mbstring \
+#        mbstring \
         mysqli \
         opcache \
         pdo \
@@ -119,7 +119,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"]

config/nginx/in-vhost.conf

@@ -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;

docker-compose.yml

@@ -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