*Default: "/healthcheck"*|Set the path for the health check endpoint. (Official docs)|all (except `cli` and `frankenphp`) `HEALTHCHECK_SSL_CERTIFICATE_FILE`
*Default: "/etc/ssl/healthcheck/localhost.crt"*|Set the path to the SSL certificate for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp `HEALTHCHECK_SSL_PRIVATE_KEY_FILE`
*Default: "/etc/ssl/healthcheck/localhost.key"*|Set the path to the SSL private key for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp -`LOG_OUTPUT_LEVEL`
*Default:*
*"warn" (for all)*
*"info" (for frankenphp)*|Set your container output different verbosity levels: debug, warn, info, off |all +`LOG_OUTPUT_LEVEL`
*Default:*
*"warn" (for all)*
*"info" (for frankenphp)*|Set the verbosity level for container output and service logs. Valid values (least to most verbose): `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info`, `debug`. Each level is translated to the native log configuration for PHP, PHP-FPM, and the active web server.
âšī¸ FrankenPHP defaults to `info` because Caddy unifies access and error logs â setting `warn` would suppress HTTP request logs entirely (unlike Apache/NGINX where access logs are a separate directive).|all `NGINX_ACCESS_LOG`
*Default: "/dev/stdout"*|Set the default output stream for access log.|fpm-nginx `NGINX_ERROR_LOG`
*Default: "/dev/stderr"*|Set the default output stream for error log.|fpm-nginx `NGINX_FASTCGI_BUFFERS`
*Default: "8 8k"*|Sets the number and size of the buffers used for reading a response from a FastCGI server. (Official Docs)|fpm-nginx diff --git a/src/common/etc/entrypoint.d/0-container-info.sh b/src/common/etc/entrypoint.d/0-container-info.sh index b92ee2bdb..7ef26e334 100644 --- a/src/common/etc/entrypoint.d/0-container-info.sh +++ b/src/common/etc/entrypoint.d/0-container-info.sh @@ -1,7 +1,7 @@ #!/bin/sh -if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$LOG_OUTPUT_LEVEL" = "off" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then +if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then - echo "đ $0: Container info was display was skipped." + echo "đ $0: Container info display was skipped." fi # Skip the rest of the script exit 0 diff --git a/src/common/usr/local/bin/docker-php-serversideup-entrypoint b/src/common/usr/local/bin/docker-php-serversideup-entrypoint index 03546fc98..8dd38045c 100644 --- a/src/common/usr/local/bin/docker-php-serversideup-entrypoint +++ b/src/common/usr/local/bin/docker-php-serversideup-entrypoint @@ -13,7 +13,7 @@ fi # Check if the default command is being used case "$1" in - "/init" | "php-fpm") + "/init" | "php-fpm" | "frankenphp") SERVERSIDEUP_DEFAULT_COMMAND="true" ;; esac diff --git a/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh b/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh index 82c28d374..2b7dc5fe7 100644 --- a/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh +++ b/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh @@ -9,6 +9,13 @@ if [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then exit 0 fi +if [ "$SERVERSIDEUP_DEFAULT_COMMAND" != "true" ]; then + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SERVERSIDEUP_DEFAULT_COMMAND is not true, so we won't generate a self-signed SSL key pair." + fi + exit 0 +fi + SSL_CERTIFICATE_FILE=${SSL_CERTIFICATE_FILE:-"/etc/ssl/private/self-signed-web.crt"} SSL_PRIVATE_KEY_FILE=${SSL_PRIVATE_KEY_FILE:-"/etc/ssl/private/self-signed-web.key"} SSL_MODE=${SSL_MODE:-"off"} @@ -16,7 +23,9 @@ HEALTHCHECK_SSL_CERTIFICATE_FILE=${HEALTHCHECK_SSL_CERTIFICATE_FILE:-"/etc/ssl/h HEALTHCHECK_SSL_PRIVATE_KEY_FILE=${HEALTHCHECK_SSL_PRIVATE_KEY_FILE:-"/etc/ssl/healthcheck/localhost.key"} if [ "$SSL_MODE" = "off" ]; then - echo "âšī¸ NOTICE ($script_name): SSL mode is off, so we won't generate a self-signed SSL key pair." + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SSL mode is off, so we won't generate a self-signed SSL key pair." + fi return 0 fi @@ -45,7 +54,9 @@ if [ -d "/etc/frankenphp/" ]; then fi if [ -f "$SSL_CERTIFICATE_FILE" ] && [ -f "$SSL_PRIVATE_KEY_FILE" ]; then - echo "âšī¸ NOTICE ($script_name): SSL certificate and private key already exist, so we'll use the existing files." + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SSL certificate and private key already exist, so we'll use the existing files." + fi return 0 fi diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile index 0d972084b..bdb49c0ea 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile @@ -1,5 +1,5 @@ log { format {$CADDY_LOG_FORMAT:console} output {$CADDY_LOG_OUTPUT:stdout} - level {$CADDY_SERVER_LOG_LEVEL:INFO} + level {$CADDY_SERVER_LOG_LEVEL:DEBUG} } From a7fb85ef075ebb97c3b9bf226567896c19681ae6 Mon Sep 17 00:00:00 2001 From: Jay Rogers
'
@@ -27,7 +27,7 @@ jobs:
with:
organization: true
maximum: 500
- fallback: '
'
diff --git a/README.md b/README.md
index bc350c7aa..2d4e819f1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-
+
#### Bronze Sponsors
-No bronze sponsors yet. Become a sponsor â
+No bronze sponsors yet. Become a sponsor â
#### Infrastructure Sponsors
This project requires significant computing power to build and maintain over 8,000 different Docker image tags. We're extremely grateful for the following sponsors:
@@ -176,7 +176,7 @@ We're [Dan](https://x.com/danpastori) and [Jay](https://x.com/jaydrogers) - a tw
* **đģ [GitHub](https://github.com/serversideup)** - Check out our other open source projects.
* **đĢ [Newsletter](https://serversideup.net/subscribe)** - Skip the algorithms and get quality content right to your inbox.
* **đĨ [Twitter](https://x.com/serversideup)** - You can also follow [Dan](https://x.com/danpastori) and [Jay](https://x.com/jaydrogers).
-* **â¤ī¸ [Sponsor Us](https://github.com/sponsors/serversideup)** - Please consider sponsoring us so we can create more helpful resources.
+* **â¤ī¸ [Sponsor Us](https://serversideup.net/sponsor/)** - Please consider sponsoring us so we can create more helpful resources.
## Our Products
If you appreciate this project, be sure to check out our other projects.
diff --git a/docs/app/app.config.ts b/docs/app/app.config.ts
index 8fe6a9bb7..4646d4997 100644
--- a/docs/app/app.config.ts
+++ b/docs/app/app.config.ts
@@ -116,7 +116,7 @@ export default defineAppConfig({
},{
'trailingIcon': 'i-lucide-heart',
'label': 'Sponsor',
- 'to': 'https://github.com/sponsors/serversideup',
+ 'to': 'https://serversideup.net/sponsor/',
'target': '_blank',
'aria-label': 'Sponsor',
'size': 'xl',
diff --git a/docs/app/components/Badges.vue b/docs/app/components/Badges.vue
index 498535522..6cc6c1aac 100644
--- a/docs/app/components/Badges.vue
+++ b/docs/app/components/Badges.vue
@@ -3,6 +3,6 @@
- 
- *Default: "false"*|Skip the database connection check before running migrations.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_MIGRATION_TIMEOUT`
*Default: "30"*|The number of seconds to wait for the database to come online before attempting `php artisan migrate`..
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_ROUTE_CACHE`
*Default: "true"*|Automatically run "php artisan route:cache" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all +`AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND`
*Default: "false"*|When set to `true`, the Laravel Automations script will exit gracefully (without error) if Laravel is not detected in `APP_BASE_DIR`, instead of failing the container. Useful when `AUTORUN_ENABLED=true` is set on a shared image where Laravel may not always be present (e.g. before the first `composer install`).
âšī¸ Requires `AUTORUN_ENABLED = true` to have any effect.| all `AUTORUN_LARAVEL_STORAGE_LINK`
*Default: "true"*|Automatically run "php artisan storage:link" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_VIEW_CACHE`
*Default: "true"*|Automatically run "php artisan view:cache" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `CADDY_ADMIN`
*Default: "off"*|Enable Caddy admin interface. (Official docs)|frankenphp diff --git a/src/common/etc/entrypoint.d/50-laravel-automations.sh b/src/common/etc/entrypoint.d/50-laravel-automations.sh index 3634c0a12..857f76fab 100644 --- a/src/common/etc/entrypoint.d/50-laravel-automations.sh +++ b/src/common/etc/entrypoint.d/50-laravel-automations.sh @@ -9,6 +9,7 @@ script_name="laravel-automations" # Set default values for Laravel automations : "${AUTORUN_ENABLED:=false}" : "${AUTORUN_DEBUG:=false}" +: "${AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND:=false}" # Set default values for storage link : "${AUTORUN_LARAVEL_STORAGE_LINK:=true}" @@ -469,6 +470,10 @@ if laravel_is_installed; then artisan_optimize fi else + if [ "$AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND" = "true" ]; then + debug_log "Laravel not detected in $APP_BASE_DIR. Skipping automations (AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND=true)." + exit 0 + fi echo "â $script_name: Could not detect Laravel installation." echo "âšī¸ Check that the application is installed in $APP_BASE_DIR" exit 1 From a9f3c6c3ef045b476690bfac59fc4853abcb65e7 Mon Sep 17 00:00:00 2001 From: Jay Rogers