diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index dc4924789..1a943cd73 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -940,6 +940,15 @@ function generateEnvValue(string $command, Service|Application|null $service = n case 'REALBASE64_32': $generatedValue = base64_encode(Str::random(32)); break; + case 'HEX_32': + $generatedValue = bin2hex(Str::random(32)); + break; + case 'HEX_64': + $generatedValue = bin2hex(Str::random(64)); + break; + case 'HEX_128': + $generatedValue = bin2hex(Str::random(128)); + break; case 'USER': $generatedValue = Str::random(16); break; diff --git a/config/constants.php b/config/constants.php index b29adfff3..9ad6dda71 100644 --- a/config/constants.php +++ b/config/constants.php @@ -2,7 +2,7 @@ return [ 'coolify' => [ - 'version' => '4.0.0-beta.372', + 'version' => '4.0.0-beta.373', 'self_hosted' => env('SELF_HOSTED', true), 'autoupdate' => env('AUTOUPDATE'), 'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'), diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index b581fb3c5..5213479c8 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -43,8 +43,9 @@ @endauth - - @section('body') +@section('body') + + - @show - + +@show diff --git a/resources/views/livewire/project/service/edit-compose.blade.php b/resources/views/livewire/project/service/edit-compose.blade.php index 3b1e1a3bc..a99c117fb 100644 --- a/resources/views/livewire/project/service/edit-compose.blade.php +++ b/resources/views/livewire/project/service/edit-compose.blade.php @@ -13,7 +13,7 @@ -
+
diff --git a/resources/views/livewire/project/shared/environment-variable/all.blade.php b/resources/views/livewire/project/shared/environment-variable/all.blade.php index deb785caa..38ea192b5 100644 --- a/resources/views/livewire/project/shared/environment-variable/all.blade.php +++ b/resources/views/livewire/project/shared/environment-variable/all.blade.php @@ -3,7 +3,7 @@

Environment Variables

- +
@@ -38,7 +38,7 @@
Environment (secrets) variables for Production.
@php - $requiredEmptyVars = $resource->environment_variables->filter(function($env) { + $requiredEmptyVars = $resource->environment_variables->filter(function ($env) { return $env->is_required && empty($env->value); }); $otherVars = $resource->environment_variables->diff($requiredEmptyVars); @@ -62,11 +62,13 @@ @endif @else
- + @if ($showPreview) - + @endif Save All Environment Variables diff --git a/templates/compose/bluesky-pds.yaml b/templates/compose/bluesky-pds.yaml new file mode 100644 index 000000000..679eb8e79 --- /dev/null +++ b/templates/compose/bluesky-pds.yaml @@ -0,0 +1,36 @@ +# ignore: true +# documentation: https://github.com/bluesky-social/pds +# slogan: A social network for the decentralized web +# tags: pds, bluesky, social, network, decentralized +# logo: +# port: 3000 + +services: + pds: + image: ghcr.io/bluesky-social/pds:0.4 + volumes: + - pds-data:/pds + environment: + - SERVICE_FQDN_PDS_3000 + - PDS_JWT_SECRET=${SERVICE_BASE64_PDS} + - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_PDS} + - PDS_ADMIN_EMAIL=${PDS_ADMIN_EMAIL:-admin@example.com} + - PDS_DATADIR=${PDS_DATADIR:-/pds} + - PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATADIR:-/pds}/blocks + - PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800} + - PDS_HOSTNAME=${SERVICE_URL_PDS} + - PDS_DID_PLC_URL=https://plc.directory + - PDS_BSKY_APP_VIEW_URL=https://api.bsky.app + - PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app + - PDS_REPORT_SERVICE_URL=https://mod.bsky.app + - PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac + - PDS_CRAWLERS=https://bsky.network + - LOG_ENABLED=${LOG_ENABLED:-true} + - PDS_EMAIL_SMTP_URL=${PDS_EMAIL_SMTP_URL:-smtp://localhost:8025} + - PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS:-admin@example.com} + - PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${SERVICE_HEX_32_ROTATIONKEY} + healthcheck: + test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"] + interval: 2s + timeout: 10s + retries: 10 diff --git a/versions.json b/versions.json index 20b06b4de..089cdc992 100644 --- a/versions.json +++ b/versions.json @@ -1,10 +1,10 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.372" + "version": "4.0.0-beta.373" }, "nightly": { - "version": "4.0.0-beta.373" + "version": "4.0.0-beta.374" }, "helper": { "version": "1.0.4"