fixed startup so that the app is env aware

Author: alexjustesen

Dockerfile

@@ -3,33 +3,33 @@ FROM serversideup/php:8.1-fpm-nginx
 # Install addition packages
 RUN apt-get update && apt-get install -y \
     cron \
-    supervisor \
     php8.1-bcmath \
     php8.1-pgsql \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
-    && rm -f /etc/cont-init.d/50-laravel-automations
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
 
 # Install Speedtest cli
 RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash \
     && apt-get install -y speedtest
 
 # Copy package configs
 COPY docker/deploy/cron/scheduler /etc/cron.d/scheduler
-COPY docker/deploy/entrypoint /usr/local/bin/entrypoint
-COPY docker/deploy/etc/cont-init.d/ /etc/cont-init.d/
-COPY docker/deploy/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-RUN chmod 0644 /etc/cron.d/scheduler \
-    && crontab /etc/cron.d/scheduler \
-    && chmod +x /usr/local/bin/entrypoint
+COPY docker/deploy/etc/services.d/ /etc/services.d/
 
 # Copy app
 COPY . /var/www/html
 COPY .env.docker .env
 
 # Install app dependencies
 RUN composer install --no-interaction --prefer-dist --optimize-autoloader --no-dev \
-    && chown -R 9999:9999 /var/www/html
+    && mkdir -p /app \
+    && mkdir -p storage/logs \
+    && php artisan optimize:clear \
+    && chown -R webuser:webgroup /var/www/html \
+    && rm -rf /etc/cont-init.d/50-laravel-automations \
+    && chmod 0644 /etc/cron.d/scheduler \
+    && crontab /etc/cron.d/scheduler \
+    && cp docker/deploy/entrypoint.sh /entrypoint \
+    && chmod +x /entrypoint
 
-ENTRYPOINT ["entrypoint"]
+ENTRYPOINT ["/entrypoint"]

README.md

@@ -16,8 +16,8 @@ docker run -itd --name speedtest-tracker \
     -p 8080:80 \
     -e "PHP_POOL_NAME=speedtest-tracker_php" \
     -e "DB_CONNECTION=sqlite" \
-    -e "DB_DATABASE=/appdata/database.sqlite" \
-    -v speedtest-tracker_app:/appdata \
+    -e "DB_DATABASE=/app/database.sqlite" \
+    -v speedtest-tracker_app:/app \
     speedtest-tracker
 ```
 

app/Jobs/SearchForSpeedtests.php

@@ -9,6 +9,7 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\File;
 use Symfony\Component\Yaml\Yaml;
 
 class SearchForSpeedtests implements ShouldQueue
@@ -32,9 +33,15 @@ public function __construct()
      */
     public function handle()
     {
-        $config = Yaml::parseFile(
-            base_path().'/config.yml'
-        );
+        if (File::exists(base_path().'/config.yml')) {
+            $config = Yaml::parseFile(
+                base_path().'/config.yml'
+            );
+        }
+
+        if (File::exists('/app/config.yml')) {
+            $config = Yaml::parseFile('/app/config.yml');
+        }
 
         $speedtest = $config['speedtest'];
 

docker/deploy/cron/scheduler

@@ -1 +1 @@
-* * * * * webuser cd /var/www/html && php artisan schedule:run >/dev/null 2>&1
+* * * * * webuser cd /var/www/html && php artisan schedule:run >> /dev/null 2>&1

docker/deploy/entrypoint

@@ -0,0 +1,61 @@
+#!/usr/bin/env sh
+
+if [ $# -gt 0 ];then
+    # If we passed a command, run it as root
+    exec "$@"
+else
+    echo ""
+    echo ""
+    echo "🐇  Configuring Speedtest Tracker..."
+
+    if [ ${DB_CONNECTION:="sqlite"} == "sqlite" ]; then
+        # Check for database
+        if [ ! -f /app/database.sqlite ]; then
+            echo "🙄  Database file not found, creating..."
+
+            touch /app/database.sqlite
+        else
+            echo "✅  Database exists"
+        fi
+    fi
+
+    # Check for config yaml file
+    if [ ! -f /app/config.yml ]; then
+        echo "🙄  Config file not found, creating..."
+        cp /var/www/html/config.example.yml /app/config.yml
+    else
+        echo "✅  Config file exists"
+    fi
+
+    # Check for app key
+    if grep -E "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /var/www/html/.env > /dev/null; then
+        echo "✅  App key exists"
+    else
+        echo "⏳  Generating app key..."
+        php /var/www/html/artisan key:generate --no-ansi -q
+    fi
+
+    # Link storage
+    echo "📦  Linking storage..."
+    php /var/www/html/artisan storage:link --no-ansi -q
+
+    # Build cache
+    echo "💰  Building the cache..."
+    php /var/www/html/artisan config:cache --no-ansi -q
+    php /var/www/html/artisan route:cache --no-ansi -q
+
+    # Migrate database
+    echo "🚛  Migrating the database..."
+    php /var/www/html/artisan migrate --force --no-ansi -q
+
+    # Fix permissions again, just in case
+    echo "🔑  Fixing permissions..."
+    chown -R webuser:webgroup /var/www/html
+
+    # App install done, show a message
+    echo "✅  All set, starting Speedtest Tracker container..."
+    echo ""
+    echo ""
+
+    exec /init
+fi

docker/deploy/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+exec cron -f -l 8

docker/deploy/etc/cont-init.d/50-speedtest-automations

@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+# Switch to web user
+su webuser
+
+# Bring up PHP queue worker
+exec php /var/www/html/artisan queue:work --tries=3 --no-ansi -q