Merge branch 'next' into fix/service-update-required-params

2025-08-04 08:39:35 -04:00
parent ad8f442318 84a2073f7f
commit d3f46e2625
26 changed files with 115 additions and 50 deletions
--- a/app/View/Components/Services/Advanced.php
+++ b/app/View/Components/Services/Advanced.php
@@ -1,13 +1,13 @@
 <?php

-namespace App\View\Components\services;
+namespace App\View\Components\Services;

 use App\Models\Service;
 use Closure;
 use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;

-class advanced extends Component
+class Advanced extends Component
 {
    /**
     * Create a new component instance.
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "تسجيل الدخول باستخدام Infomaniak",
    "auth.already_registered": "هل سبق لك التسجيل؟",
    "auth.confirm_password": "تأكيد كلمة المرور",
-    "auth.forgot_password": "نسيت كلمة المرور",
+    "auth.forgot_password_link": "هل نسيت كلمة المرور؟",
+    "auth.forgot_password_heading": "استعادة كلمة المرور",
    "auth.forgot_password_send_email": "إرسال بريد إلكتروني لإعادة تعيين كلمة المرور",
    "auth.register_now": "تسجيل",
    "auth.logout": "تسجيل الخروج",
--- a/lang/az.json
+++ b/lang/az.json
@@ -11,7 +11,8 @@
  "auth.login.infomaniak": "Infomaniak ilə daxil ol",
  "auth.already_registered": "Qeytiyatınız var?",
  "auth.confirm_password": "Şifrəni təsdiqləyin",
-  "auth.forgot_password": "Şifrəmi unutdum",
+  "auth.forgot_password_link": "Şifrəmi unutdum?",
+  "auth.forgot_password_heading": "Şifrəni bərpa et",
  "auth.forgot_password_send_email": "Şifrəni sıfırlamaq üçün e-poçt göndər",
  "auth.register_now": "Qeydiyyat",
  "auth.logout": "Çıxış",
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Přihlásit se pomocí Infomaniak",
    "auth.already_registered": "Již jste registrováni?",
    "auth.confirm_password": "Potvrďte heslo",
-    "auth.forgot_password": "Zapomněli jste heslo",
+    "auth.forgot_password_link": "Zapomněli jste heslo?",
+    "auth.forgot_password_heading": "Obnovení hesla",
    "auth.forgot_password_send_email": "Poslat e-mail pro resetování hesla",
    "auth.register_now": "Registrovat se",
    "auth.logout": "Odhlásit se",
--- a/lang/de.json
+++ b/lang/de.json
@@ -11,7 +11,8 @@
    "auth.login.zitadel": "Mit Zitadel anmelden",
    "auth.already_registered": "Bereits registriert?",
    "auth.confirm_password": "Passwort bestätigen",
-    "auth.forgot_password": "Passwort vergessen",
+    "auth.forgot_password_link": "Passwort vergessen?",
+    "auth.forgot_password_heading": "Passwort-Wiederherstellung",
    "auth.forgot_password_send_email": "Passwort zurücksetzen E-Mail senden",
    "auth.register_now": "Registrieren",
    "auth.logout": "Abmelden",
--- a/lang/en.json
+++ b/lang/en.json
@@ -12,7 +12,8 @@
    "auth.login.zitadel": "Login with Zitadel",
    "auth.already_registered": "Already registered?",
    "auth.confirm_password": "Confirm password",
-    "auth.forgot_password": "Forgot password",
+    "auth.forgot_password_link": "Forgot password?",
+    "auth.forgot_password_heading": "Password recovery",
    "auth.forgot_password_send_email": "Send password reset email",
    "auth.register_now": "Register",
    "auth.logout": "Logout",
--- a/lang/es.json
+++ b/lang/es.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Acceder con Infomaniak",
    "auth.already_registered": "¿Ya estás registrado?",
    "auth.confirm_password": "Confirmar contraseña",
-    "auth.forgot_password": "¿Olvidaste tu contraseña?",
+    "auth.forgot_password_link": "¿Olvidaste tu contraseña?",
+    "auth.forgot_password_heading": "Recuperación de contraseña",
    "auth.forgot_password_send_email": "Enviar correo de recuperación de contraseña",
    "auth.register_now": "Registrar",
    "auth.logout": "Cerrar sesión",
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "ورود با Infomaniak",
    "auth.already_registered": "قبلاً ثبت نام کرده‌اید؟",
    "auth.confirm_password": "تایید رمز عبور",
-    "auth.forgot_password": "فراموشی رمز عبور",
+    "auth.forgot_password_link": "رمز عبور را فراموش کرده‌اید؟",
+    "auth.forgot_password_heading": "بازیابی رمز عبور",
    "auth.forgot_password_send_email": "ارسال ایمیل بازیابی رمز عبور",
    "auth.register_now": "ثبت نام",
    "auth.logout": "خروج",
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "Connexion avec Infomaniak",
    "auth.already_registered": "Déjà enregistré ?",
    "auth.confirm_password": "Confirmer le mot de passe",
-    "auth.forgot_password": "Mot de passe oublié",
+    "auth.forgot_password_link": "Mot de passe oublié ?",
+    "auth.forgot_password_heading": "Récupération du mot de passe",
    "auth.forgot_password_send_email": "Envoyer l'email de réinitialisation de mot de passe",
    "auth.register_now": "S'enregistrer",
    "auth.logout": "Déconnexion",
--- a/lang/id.json
+++ b/lang/id.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "Masuk dengan Infomaniak",
    "auth.already_registered": "Sudah terdaftar?",
    "auth.confirm_password": "Konfirmasi kata sandi",
-    "auth.forgot_password": "Lupa kata sandi",
+    "auth.forgot_password_link": "Lupa kata sandi?",
+    "auth.forgot_password_heading": "Pemulihan Kata Sandi",
    "auth.forgot_password_send_email": "Kirim email reset kata sandi",
    "auth.register_now": "Daftar",
    "auth.logout": "Keluar",
--- a/lang/it.json
+++ b/lang/it.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "Accedi con Infomaniak",
    "auth.already_registered": "Già registrato?",
    "auth.confirm_password": "Conferma password",
-    "auth.forgot_password": "Password dimenticata",
+    "auth.forgot_password_link": "Hai dimenticato la password?",
+    "auth.forgot_password_heading": "Recupero password",
    "auth.forgot_password_send_email": "Invia email per reimpostare la password",
    "auth.register_now": "Registrati",
    "auth.logout": "Esci",
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Infomaniakでログイン",
    "auth.already_registered": "すでに登録済みですか？",
    "auth.confirm_password": "パスワードを確認",
-    "auth.forgot_password": "パスワードを忘れた",
+    "auth.forgot_password_link": "パスワードをお忘れですか？",
+    "auth.forgot_password_heading": "パスワードの再設定",
    "auth.forgot_password_send_email": "パスワードリセットメールを送信",
    "auth.register_now": "今すぐ登録",
    "auth.logout": "ログアウト",
--- a/lang/no.json
+++ b/lang/no.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "Logg inn med Infomaniak",
    "auth.already_registered": "Allerede registrert?",
    "auth.confirm_password": "Bekreft passord",
-    "auth.forgot_password": "Glemt passord",
+    "auth.forgot_password_link": "Glemt passord?",
+    "auth.forgot_password_heading": "Gjenoppretting av passord",
    "auth.forgot_password_send_email": "Send e-post for tilbakestilling av passord",
    "auth.register_now": "Registrer deg",
    "auth.logout": "Logg ut",
--- a/lang/pl.json
+++ b/lang/pl.json
@@ -0,0 +1,44 @@
+{
+    "auth.login": "Zaloguj",
+    "auth.login.authentik": "Zaloguj się przez Authentik",
+    "auth.login.azure": "Zaloguj się przez Microsoft",
+    "auth.login.bitbucket": "Zaloguj się przez Bitbucket",
+    "auth.login.clerk": "Zaloguj się przez Clerk",
+    "auth.login.discord": "Zaloguj się przez Discord",
+    "auth.login.github": "Zaloguj się przez GitHub",
+    "auth.login.gitlab": "Zaloguj się przez Gitlab",
+    "auth.login.google": "Zaloguj się przez Google",
+    "auth.login.infomaniak": "Zaloguj się przez Infomaniak",
+    "auth.login.zitadel": "Zaloguj się przez Zitadel",
+    "auth.already_registered": "Już zarejestrowany?",
+    "auth.confirm_password": "Potwierdź hasło",
+    "auth.forgot_password_link": "Zapomniałeś hasło?",
+    "auth.forgot_password_heading": "Odzyskiwanie hasła",
+    "auth.forgot_password_send_email": "Wyślij email resetujący hasło",
+    "auth.register_now": "Zarejestruj",
+    "auth.logout": "Wyloguj",
+    "auth.register": "Zarejestruj",
+    "auth.registration_disabled": "Rejestracja jest wyłączona. Skontaktuj się z administratorem.",
+    "auth.reset_password": "Zresetuj hasło",
+    "auth.failed": "Podane dane nie zgadzają się z naszymi rekordami.",
+    "auth.failed.callback": "Nie udało się przeprocesować callbacku od dostawcy logowania.",
+    "auth.failed.password": "Podane hasło jest nieprawidłowe.",
+    "auth.failed.email": "Nie znaleziono użytkownika z takim adresem email.",
+    "auth.throttle": "Zbyt wiele prób logowania. Spróbuj ponownie za :seconds sekund.",
+    "input.name": "Nazwa",
+    "input.email": "Email",
+    "input.password": "Hasło",
+    "input.password.again": "Hasło ponownie",
+    "input.code": "Jednorazowy kod",
+    "input.recovery_code": "Kod odzyskiwania",
+    "button.save": "Zapisz",
+    "repository.url": "<span class='text-helper'>Przykłady</span><br>Dla publicznych repozytoriów użyj <span class='text-helper'>https://...</span>.<br>Dla prywatnych repozytoriów, użyj <span class='text-helper'>git@...</span>.<br><br>https://github.com/coollabsio/coolify-examples - zostanie wybrany branch <span class='text-helper'>main</span><br>https://github.com/coollabsio/coolify-examples/tree/nodejs-fastify - zostanie wybrany branch <span class='text-helper'>nodejs-fastify</span><br>https://gitea.com/sedlav/expressjs.git - zostanie wybrany branch <span class='text-helper'>main</span><br>https://gitlab.com/andrasbacsai/nodejs-example.git - zostanie wybrany branch <span class='text-helper'>main</span>",
+    "service.stop": "Ten serwis zostanie zatrzymany.",
+    "resource.docker_cleanup": "Uruchom Docker Cleanup (usunie nieużywane obrazy i cache buildera).",
+    "resource.non_persistent": "Wszystkie nietrwałe dane zostaną usunięte.",
+    "resource.delete_volumes": "Trwale usuń wszystkie wolumeny powiązane z tym zasobem.",
+    "resource.delete_connected_networks": "Trwale usuń wszystkie niepredefiniowane sieci powiązane z tym zasobem.",
+    "resource.delete_configurations": "Trwale usuń wszystkie pliki konfiguracyjne z serwera.",
+    "database.delete_backups_locally": "Wszystkie backupy zostaną trwale usunięte z lokalnej pamięci.",
+    "warning.sslipdomain": "Twoja konfiguracja została zapisana, lecz domena sslip z https jest <span class='dark:text-red-500 text-red-500 font-bold'>NIEZALECANA</span>, ponieważ serwery Let's Encrypt z tą publiczną domeną są pod rate limitem (walidacja certyfikatu SSL certificate się nie powiedzie). <br><br>Lepiej użyj własnej domeny."
+}
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -11,7 +11,8 @@
    "auth.login.infomaniak": "Entrar com Infomaniak",
    "auth.already_registered": "Já tem uma conta?",
    "auth.confirm_password": "Confirmar senha",
-    "auth.forgot_password": "Esqueceu a senha",
+    "auth.forgot_password_link": "Esqueceu a senha?",
+    "auth.forgot_password_heading": "Recuperação de senha",
    "auth.forgot_password_send_email": "Enviar e-mail para redefinir senha",
    "auth.register_now": "Cadastre-se",
    "auth.logout": "Sair",
--- a/lang/pt.json
+++ b/lang/pt.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Entrar com Infomaniak",
    "auth.already_registered": "Já tem uma conta?",
    "auth.confirm_password": "Confirmar senha",
-    "auth.forgot_password": "Esqueceu a senha?",
+    "auth.forgot_password_link": "Esqueceu a senha?",
+    "auth.forgot_password_heading": "Recuperação de senha",
    "auth.forgot_password_send_email": "Enviar e-mail de redefinição de senha",
    "auth.register_now": "Cadastrar-se",
    "auth.logout": "Sair",
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Autentificare prin Infomaniak",
    "auth.already_registered": "Sunteți deja înregistrat?",
    "auth.confirm_password": "Confirmați parola",
-    "auth.forgot_password": "Ați uitat parola",
+    "auth.forgot_password_link": "Ați uitat parola?",
+    "auth.forgot_password_heading": "Recuperare parolă",
    "auth.forgot_password_send_email": "Trimiteți e-mail-ul pentru resetarea parolei",
    "auth.register_now": "Înregistrare",
    "auth.logout": "Deconectare",
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Infomaniak ile Giriş Yap",
    "auth.already_registered": "Zaten kayıtlı mısınız?",
    "auth.confirm_password": "Şifreyi Onayla",
-    "auth.forgot_password": "Şifremi Unuttum",
+    "auth.forgot_password_link": "Şifrenizi mi unuttunuz?",
+    "auth.forgot_password_heading": "Şifre Kurtarma",
    "auth.forgot_password_send_email": "Şifre sıfırlama e-postası gönder",
    "auth.register_now": "Kayıt Ol",
    "auth.logout": "Çıkış Yap",
--- a/lang/vi.json
+++ b/lang/vi.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "Đăng Nhập Bằng Infomaniak",
    "auth.already_registered": "Đã đăng ký?",
    "auth.confirm_password": "Nhập lại mật khẩu",
-    "auth.forgot_password": "Quên mật khẩu",
+    "auth.forgot_password_link": "Quên mật khẩu?",
+    "auth.forgot_password_heading": "Khôi phục mật khẩu",
    "auth.forgot_password_send_email": "Gửi email đặt lại mật khẩu",
    "auth.register_now": "Đăng ký ngay",
    "auth.logout": "Đăng xuất",
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "使用 Infomaniak 登录",
    "auth.already_registered": "已经注册？",
    "auth.confirm_password": "确认密码",
-    "auth.forgot_password": "忘记密码",
+    "auth.forgot_password_link": "忘记密码？",
+    "auth.forgot_password_heading": "密码找回",
    "auth.forgot_password_send_email": "发送密码重置邮件",
    "auth.register_now": "注册",
    "auth.logout": "退出登录",
--- a/lang/zh-tw.json
+++ b/lang/zh-tw.json
@@ -10,7 +10,8 @@
    "auth.login.infomaniak": "使用 Infomaniak 登入",
    "auth.already_registered": "已經註冊？",
    "auth.confirm_password": "確認密碼",
-    "auth.forgot_password": "忘記密碼",
+    "auth.forgot_password_link": "忘記密碼？",
+    "auth.forgot_password_heading": "密碼找回",
    "auth.forgot_password_send_email": "發送重設密碼電郵",
    "auth.register_now": "註冊",
    "auth.logout": "登出",
--- a/resources/views/auth/forgot-password.blade.php
+++ b/resources/views/auth/forgot-password.blade.php
@@ -4,7 +4,7 @@
            <a class="flex items-center mb-1 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
                Coolify
            </a> <div class="flex items-center gap-2">
-                {{ __('auth.forgot_password') }}
+                {{ __('auth.forgot_password_heading') }}
            </div>
            <div
                class="w-full bg-white shadow-sm md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -23,7 +23,7 @@
                            required label="{{ __('input.password') }}" />

                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
+                            {{ __('auth.forgot_password_link') }}
                        </a>
                    @else
                        <x-forms.input type="email" name="email" autocomplete="email" required
@@ -31,7 +31,7 @@
                        <x-forms.input type="password" name="password" autocomplete="current-password" required
                            label="{{ __('input.password') }}" />
                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
+                            {{ __('auth.forgot_password_link') }}
                        </a>
                        @endenv

--- a/resources/views/livewire/project/shared/environment-variable/show.blade.php
+++ b/resources/views/livewire/project/shared/environment-variable/show.blade.php
@@ -21,7 +21,7 @@
            </div>
        @else
            @if ($isDisabled)
-                <div class="flex flex-col w-full gap-2 lg:flex-row">
+                <div class="flex flex-col w-full gap-2 flex-wrap lg:flex-row">
                    <x-forms.input disabled id="key" />
                    <x-forms.input disabled type="password" id="value" />
                    @if ($is_shared)
@@ -29,7 +29,7 @@
                    @endif
                </div>
            @else
-                <div class="flex flex-col w-full gap-2 lg:flex-row">
+                <div class="flex flex-col w-full gap-2 flex-wrap lg:flex-row">
                    @if ($is_multiline)
                        <x-forms.input :required="$is_redis_credential" isMultiline="{{ $is_multiline }}" id="key" />
                        <x-forms.textarea :required="$is_redis_credential" type="password" id="value" />
@@ -42,7 +42,7 @@
                    @endif
                </div>
            @endif
-            <div class="flex flex-col w-full gap-2 lg:flex-row">
+            <div class="flex flex-col w-full gap-2 flex-wrap lg:flex-row">
                @if (!$is_redis_credential)
                    @if ($type === 'service')
                        <x-forms.checkbox instantSave id="is_build_time"
@@ -88,6 +88,7 @@
                    <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
                        buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
                        confirmationText="{{ $key }}"
+                        buttonFullWidth="true"
                        confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
                        shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
                        step2ButtonText="Permanently Delete" />
@@ -101,6 +102,7 @@
                    <x-modal-confirmation title="Confirm Environment Variable Deletion?" isErrorButton
                        buttonTitle="Delete" submitAction="delete" :actions="['The selected environment variable will be permanently deleted.']"
                        confirmationText="{{ $key }}"
+                        buttonFullWidth="true"
                        confirmationLabel="Please confirm the execution of the actions by entering the Environment Variable Name below"
                        shortConfirmationLabel="Environment Variable Name" :confirmWithPassword="false"
                        step2ButtonText="Permanently Delete" />
--- a/templates/compose/authentik.yaml
+++ b/templates/compose/authentik.yaml
@@ -6,7 +6,7 @@

 services:
  authentik-server:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.6.3}
+    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.6.4}
    restart: unless-stopped
    command: server
    environment:
@@ -35,7 +35,7 @@ services:
      redis:
        condition: service_healthy
  authentik-worker:
-    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.6.3}
+    image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2025.6.4}
    restart: unless-stopped
    command: worker
    environment:
--- a/templates/compose/matrix.yaml
+++ b/templates/compose/matrix.yaml
@@ -89,14 +89,14 @@ services:
        #                      #
        ########################

-        test -n "${ENABLE_REGISTRATION}" && ! grep "#registration" /data/homeserver.yaml &>/dev/null \
+        [ "${ENABLE_REGISTRATION}" = "true" ] && ! grep "#registration" /data/homeserver.yaml &>/dev/null \
        && echo >> /data/homeserver.yaml \
        && cat <<EOF >> /data/homeserver.yaml
        #registration
        enable_registration: true  # Allows users to register on your server.
        EOF

-        ! grep ${RECAPTCHA_PUBLIC_KEY} /data/homeserver.yaml &>/dev/null \
+        [ -n "${RECAPTCHA_PUBLIC_KEY}" ] && ! grep "${RECAPTCHA_PUBLIC_KEY}" /data/homeserver.yaml &>/dev/null \
        && echo >> /data/homeserver.yaml \
        && cat <<EOF >> /data/homeserver.yaml
        # reCAPTCHA settings