Merge pull request #650 from turbo124/debian

Add index.html to public/

debian/.env

@@ -8,7 +8,16 @@ PHANTOMJS_PDF_GENERATION=false
 PDF_GENERATOR=snappdf
 TRUSTED_PROXIES='*'
 
-QUEUE_CONNECTION=database
+
+CACHE_DRIVER=redis
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
+
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+FILESYSTEM_DISK=debian_docker
 
 # DB connection
 DB_HOST=mysql
@@ -49,4 +58,5 @@ NORDIGEN_SECRET_KEY=
 IS_DOCKER=true
 SCOUT_DRIVER=null
 SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
-#SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome
+
+

debian/Dockerfile

@@ -117,16 +117,11 @@ WORKDIR /var/www/html
 RUN set -eux; \ 
     DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
     grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
-    echo "Downloading from: $DOWNLOAD_URL" && \
-    # Download and save the tar
-    curl -L "$DOWNLOAD_URL" -o /tmp/ninja.tar && \
-    # Try extraction
-    cd /var/www/html && \
-    tar -xf /tmp/ninja.tar && \
-    # List what was extracted
-    rm -f /tmp/ninja.tar && \
+    curl -L "$DOWNLOAD_URL" | tar -xvz -C /var/www/html && \
     chown -R www-data:www-data /var/www/html
 
+USER www-data
+
 # Install dependencies
 RUN composer install --no-dev --no-scripts --no-autoloader
 
@@ -135,7 +130,10 @@ RUN composer dump-autoload --optimize \
     && php artisan optimize \
     && php artisan view:cache \
     && php artisan config:cache \
-    && php artisan route:cache
+    && php artisan route:cache \
+    && php artisan storage:link
+
+USER root
 
 # Setup supervisor
 COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
@@ -161,6 +159,8 @@ RUN mkdir -p \
     /var/run \
     /var/log/supervisor 
 
+RUN cp /var/www/html/resources/views/react/index.blade.php /var/www/html/public/index.html
+
 # Set permissions
 RUN chown -R www-data:www-data \
     /var/www/html/storage \

debian/docker-compose.yml

@@ -8,7 +8,7 @@ x-logging: &default-logging
 
 services:
   app:
-    image: invoiceninja/invoiceninja-debian:latest
+    image: invoiceninja/invoiceninja-debian:latest 
     restart: unless-stopped
     env_file:
       - ./.env
@@ -16,7 +16,7 @@ services:
       - ./.env:/var/www/html/.env  
       - app_storage:/var/www/html/storage
       - app_cache:/var/www/html/bootstrap/cache
-      - public_files:/var/www/html/public  
+      - app_files:/var/www/html
 
     networks:
       - app-network
@@ -39,10 +39,8 @@ services:
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - type: volume
-        source: public_files
-        target: /var/www/html/public
-        read_only: true
+      - app_files:/var/www/html:ro
+
     networks:
       - app-network
     depends_on:
@@ -103,13 +101,11 @@ networks:
 volumes:
   app_storage:
     driver: local
-  app_public:
-    driver: local
   app_cache:
     driver: local
   mysql_data:
     driver: local
   redis_data:
     driver: local
-  public_files:  
-    driver: local
+  app_files:
+    driver: local

debian/php/php-fpm.conf

@@ -3,7 +3,7 @@ user = www-data
 group = www-data
 listen = 0.0.0.0:9000
 pm = dynamic
-pm.max_children = 5
+pm.max_children = 10
 pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3

debian/rootfs/docker-entrypoint-init.d/10-init-in.sh

@@ -3,11 +3,11 @@
 php artisan db:seed --force
 
 # Build up array of arguments...
-if [[ ! -z "${IN_USER_EMAIL}" ]]; then
+if [ ! -z "${IN_USER_EMAIL}" ]; then
     email="--email ${IN_USER_EMAIL}"
 fi
 
-if [[ ! -z "${IN_PASSWORD}" ]]; then
+if [ ! -z "${IN_PASSWORD}" ]; then
     password="--password ${IN_PASSWORD}"
 fi
 

debian/scripts/init.sh

@@ -36,20 +36,22 @@ mkdir -p \
     /var/www/html/storage/framework/sessions \
     /var/www/html/storage/framework/views \
     /var/www/html/storage/logs \
-    /var/www/html/public/uploads
+    /var/www/html/public/storage
 
 # Set directory permissions without changing ownership
 chmod -R 775 \
     /var/www/html/storage \
     /var/www/html/bootstrap/cache \
-    /var/www/html/public/uploads
+    /var/www/html/public/storage
+
+chown -R www-data:www-data /var/www/html/storage
 
 # Clear and cache config in production
 if [ "$APP_ENV" = "production" ]; then
-    php artisan config:cache
-    php artisan optimize
-    php artisan package:discover
-    php artisan migrate --force
+    gosu www-data php artisan config:cache
+    gosu www-data php artisan optimize
+    gosu www-data php artisan package:discover
+    gosu www-data php artisan migrate --force
 
     echo "Checking initialization status..."