fix: move storage:link to dockerfile

.dockerignore

@@ -13,4 +13,4 @@ storage/framework/cache/*
 storage/framework/sessions/*
 storage/framework/testing/*
 storage/framework/views/*
-storage/framework/logs/*
+storage/logs/*

.env.example

@@ -66,7 +66,6 @@ QUEUE_CONNECTION=redis
 
 CACHE_STORE=redis
 
-REDIS_CLIENT=predis
 REDIS_HOST=investbrain-redis
 REDIS_PATH=/tmp/database_server.sock
 REDIS_PASSWORD=null

README.md

@@ -214,6 +214,14 @@ docker exec -it investbrain-app tail -f storage/logs/laravel.log
 
 <details>
 
+**<summary>Application styling is broken and images are too big</summary>**
+
+If you're serving Investbrain from a DNS name (e.g. example.com), it's likely that you haven't updated the `ASSET_URL` environment yet. The URL provided there will be used to generate absolute URLs for images, JS, and CSS assets on the front end of the application.
+
+</details>
+
+<details>
+
 **<summary>Market data not refreshing on fresh install</summary>**
 
 If you're unable to refresh market data out of the box (i.e. your market data provider is set to Yahoo), there is a chance Yahoo is being blocked by a firewall or adblocker.  Pihole is known to block `fc.yahoo.com` which is the domain used to query Yahoo. 

config/cache.php

@@ -17,7 +17,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_STORE', 'database'),
+    'default' => env('CACHE_STORE', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

config/queue.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'database'),
+    'default' => env('QUEUE_CONNECTION', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

config/session.php

@@ -20,7 +20,7 @@ return [
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'database'),
+    'driver' => env('SESSION_DRIVER', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

docker-compose.yml

@@ -8,23 +8,24 @@ services:
     restart: unless-stopped
     tty: true
     ports:
-      - "${APP_PORT:-8000}:80"
+      - 8000:80
-    environment:
+    environment: # You can either use these properties OR an .env file. Do not use both!
       APP_KEY: "" # Generate a key using `echo base64:$(openssl rand -base64 32)`
       APP_URL: "http://localhost:8000"
       ASSET_URL: "http://localhost:8000"
       DB_CONNECTION: mysql
       DB_HOST: investbrain-mysql
       DB_PORT: 3306
-      DB_DATABASE: ${DB_DATABASE:-investbrain}
+      DB_DATABASE: investbrain
-      DB_USERNAME: ${DB_USERNAME:-investbrain}
+      DB_USERNAME: investbrain
-      DB_PASSWORD: ${DB_PASSWORD:-investbrain}
+      DB_PASSWORD: investbrain
       SESSION_DRIVER: redis
       QUEUE_CONNECTION: redis
       CACHE_STORE: redis
       REDIS_HOST: investbrain-redis
     volumes:
-      - ./storage:/var/app/storage
+      - investbrain-storage:/var/app/storage # You can use a volume... 
+      # - /path/to/storage:/var/app/storage # ...or you can use a path on host
     depends_on:
       - mysql
       - redis
@@ -55,5 +56,6 @@ services:
     networks:
       - investbrain-network
 volumes:
+  investbrain-storage:
   investbrain-redis:
   investbrain-mysql:

docker/Dockerfile

@@ -3,8 +3,6 @@ FROM php:8.3-fpm
 ENV DEBIAN_FRONTEND=noninteractive
 ENV APP_NAME=Investbrain
 ENV VITE_APP_NAME=Investbrain
-ENV APP_DEBUG=true
-ENV SELF_HOSTED=true
 
 # Set the working directory
 COPY . /var/app
@@ -39,27 +37,26 @@ RUN rm /etc/nginx/sites-enabled/default \
     && rm -rf /var/www/html \
     && ln -s /var/app /var/www/app
 
-# Set permissions and ensure www-data has a shell available
-RUN chown -R www-data:www-data . \ 
-    && chmod -R 775 ./storage \
-    && chmod +x ./docker/entrypoint.sh \
-    && usermod -s /bin/bash www-data 
-
 # Install Composer and Node.js Install PHP dependencies and build front end assets
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
     && composer install --no-scripts --optimize-autoloader \
-    && npm install && npm run build
+    && npm install && npm run build \
+    && rm -rf node_modules
 
 # Copy over configs
 COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf
 COPY ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
+# Set permissions and link storage
+RUN php artisan storage:link \
+    && chown -R www-data:www-data . \ 
+    && chmod +x ./docker/entrypoint.sh
+
 # Serve on port 80
 EXPOSE 80
 
 # Set up healthcheck
-HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -f http://localhost || exit 1
+HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -f http://localhost/up || exit 1
 
 # Run everything else
 ENTRYPOINT ["/bin/bash", "./docker/entrypoint.sh"]
-

docker/entrypoint.sh

@@ -2,25 +2,23 @@
 
 cd /var/app
 
+# Starting Investbrain
+echo "CiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICAqICBJSUkgICBOICAgTiAgViAgIFYgIEVFRUVFICBTU1NTICBUVFRUVCAgQkJCQkIgICBSUlJSICAgIEFBQUFBICBJSUkgICBOICAgTiAgKgogICogICBJICAgIE5OICBOICBWICAgViAgRSAgICAgIFMgICAgICAgVCAgICBCICAgIEIgIFIgICBSICAgQSAgIEEgICBJICAgIE5OICBOICAqCiAgKiAgIEkgICAgTiBOIE4gIFYgICBWICBFRUVFICAgU1NTUyAgICBUICAgIEJCQkJCICAgUlJSUiAgICBBQUFBQSAgIEkgICAgTiBOIE4gICoKICAqICAgSSAgICBOICBOTiAgViAgIFYgIEUgICAgICAgICAgUyAgIFQgICAgQiAgICBCICBSICBSICAgIEEgICBBICAgSSAgICBOICBOTiAgKgogICogIElJSSAgIE4gICBOICAgVlZWICAgRUVFRUUgIFNTU1MgICAgVCAgICBCQkJCQiAgIFIgICBSICAgQSAgIEEgIElJSSAgIE4gICBOICAqCiAgKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioKICA=" | base64 -d
+
 echo -e "\n====================== Validating environment...  ====================== "
-for dir in storage/framework/cache storage/framework/sessions storage/framework/views; do
-    if [ ! -d "$dir" ]; then
-        echo -e "\n > $dir is missing. Creating scaffold for storage directory... "
-        mkdir -p storage/framework/{cache,sessions,views}
-        chmod -R 775 storage
-        chown -R www-data:www-data storage
-    fi
-done
 
-if [ ! -L "public/storage" ]; then
+# Ensure app storage directory is scaffolded
-    echo -e "\n > Creating symbolic link for app public storage... "
+mkdir -p storage/{{framework/cache,framework/sessions,framework/views},app,logs}
 
-    php artisan storage:link
+# Ensure storage directory is permissioned for www-data
-fi
+chmod -R 775 storage
+chown -R www-data:www-data storage
 
+echo -e "\n > Storage directory scaffolding is OK... "
+
+# Ensure app key is generated
 if [[ -z "$APP_KEY" ]]; then
     echo -e "\n > Oops! The required APP_KEY configuration is missing in your environment! "
-    echo -e "\n > You should set this APP_KEY in your .env file! "
 
     draw_box() {
       local text="$1"
@@ -34,23 +32,36 @@ if [[ -z "$APP_KEY" ]]; then
 
     export APP_KEY=$(php artisan key:generate --show)
     draw_box $APP_KEY
+else
+    echo -e "\n > APP_KEY is OK... "
 fi
 
 echo -e "\n====================== Running migrations...  ====================== "
-run_migrations() {
+
-    php artisan migrate --force
+# Wait 60 seconds for database to be ready
-}
+RETRIES=12 
-RETRIES=12 # wait 60 seconds for database to be ready
 DELAY=5
+run_migrations() {
+    sleep $DELAY
+    # php artisan migrate --force
+    output=$(php artisan migrate --force 2>/dev/null)
+    if [[ $? -eq 0 ]]; then
+        echo "$output"
+        return 0
+    else
+        return 1
+    fi
+}
 until run_migrations; do
   RETRIES=$((RETRIES-1))
-  if [ $RETRIES -le 0 ]; then
+  if [[ $RETRIES -le 0 ]]; then
-    echo -e "\n > Database is not ready after $RETRIES attempts. Exiting... "
+    echo -e "\n > Database is not ready after one minute. Exiting... \n"
     exit 1
   fi
-  echo -e "\n > Waiting for database to be ready... retrying in $DELAY seconds. "
+  echo -e "\n > Waiting for database to be ready... retrying in $DELAY seconds. \n"
-  sleep $DELAY
 done
 
 echo -e "\n====================== Spinning up Supervisor daemon...  ====================== \n"
+
 exec supervisord -c /etc/supervisor/conf.d/supervisord.conf
+

docker/supervisord.conf

@@ -2,33 +2,38 @@
 nodaemon=true
 user=root
 pidfile=/var/run/supervisord.pid
+logfile=/var/log/supervisor/supervisord.log
 
 [program:nginx]
 command=nginx -g 'daemon off;'
 autostart=true
 autorestart=true
 redirect_stderr=true
-redirect_stdout=true
 
 [program:php]
 command=php-fpm -F
 autostart=true
 autorestart=true
 redirect_stderr=true
-redirect_stdout=true
 
 [program:scheduler]
 command=php artisan schedule:work
+user=www-data
 autorestart=true
 redirect_stderr=true
-redirect_stdout=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
 
 [program:queue-worker]
-command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
 process_name=%(program_name)s_%(process_num)02d
+command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
+user=www-data
 autorestart=true
 redirect_stderr=true
-redirect_stdout=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
 numprocs=2
+stopasgroup=true
+killasgroup=true
 
 [supervisorctl]