From 19e195401c37111722400a4a363750b5ef10af0e Mon Sep 17 00:00:00 2001 From: Kovah Date: Thu, 2 May 2024 22:39:52 +0200 Subject: [PATCH 1/5] Fix release dockerfiles --- CONTRIBUTING.md | 2 +- .../dockerfiles/release-multiplatform-simple.Dockerfile | 2 +- .../docker/dockerfiles/release-multiplatform.Dockerfile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 30173804..012ebf50 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -85,5 +85,5 @@ docker compose exec -it php composer run test The Base image for LinkAce contains several packages and PHP extensions needed by LinkAce. It shortens the build time of the release images. This step is not needed by any developer working on LinkAce and is just a documentation for maintainers. ```bash -docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.2-alpine -f resources/docker/dockerfiles/release-base.Dockerfile . +docker buildx build --push --platform "linux/amd64,linux/arm64,linux/arm/v7" -t linkace/base-image:php-8.3-alpine -f resources/docker/dockerfiles/release-base.Dockerfile . ``` diff --git a/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile b/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile index f5653754..d8414acb 100644 --- a/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile @@ -1,5 +1,5 @@ # DOCKERFILE RELEASE -FROM docker.io/library/linkace/linkace:latest +FROM docker.io/linkace/linkace:latest # Install nginx and supervisor RUN apk add --no-cache nginx supervisor diff --git a/resources/docker/dockerfiles/release-multiplatform.Dockerfile b/resources/docker/dockerfiles/release-multiplatform.Dockerfile index 2d26b535..cb8ac3d1 100644 --- a/resources/docker/dockerfiles/release-multiplatform.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform.Dockerfile @@ -2,7 +2,7 @@ # ================================ # PHP Dependency Setup -FROM docker.io/library/linkace/base-image:php-8.3-alpine AS builder +FROM docker.io/linkace/base-image:php-8.3-alpine AS builder WORKDIR /app # Pull composer and install required packages @@ -38,7 +38,7 @@ RUN mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-back # ================================ # Compile all assets -FROM node:20 AS npm_builder +FROM docker.io/library/node:20 AS npm_builder WORKDIR /srv COPY ./resources/assets ./resources/assets @@ -49,7 +49,7 @@ RUN npm run production # ================================ # Prepare the final image -FROM linkace/base-image:php-8.3-alpine +FROM docker.io/linkace/base-image:php-8.3-alpine WORKDIR /app # Copy the app into the container From 5f169a0dea8a853a321968ab6bcaa9897dc76955 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Fri, 3 May 2024 01:15:52 -0500 Subject: [PATCH 2/5] Fix minimum length password wording (character number) --- lang/ca_ES/setup.php | 2 +- lang/de_DE/setup.php | 2 +- lang/en_US/setup.php | 2 +- lang/es_ES/setup.php | 2 +- lang/fr_FR/setup.php | 2 +- lang/hu_HU/setup.php | 2 +- lang/it_IT/setup.php | 2 +- lang/no_NO/setup.php | 2 +- lang/pl_PL/setup.php | 2 +- lang/ro_RO/setup.php | 2 +- lang/vi_VN/setup.php | 2 +- lang/zh_CN/setup.php | 2 +- tests/Commands/ResetPasswordCommandTest.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/ca_ES/setup.php b/lang/ca_ES/setup.php index 557dab30..df723540 100644 --- a/lang/ca_ES/setup.php +++ b/lang/ca_ES/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Introdueix el teu nom', 'account_setup.email' => 'Introdueix el teu correu electrònic', 'account_setup.password' => 'Introdueix una contrasenya forta', - 'account_setup.password_requirements' => 'Longitud mínima: 10 caràcters', + 'account_setup.password_requirements' => 'Longitud mínima: 8 caràcters', 'account_setup.password_confirmed' => 'Confirma la teva contrasenya', 'account_setup.create' => 'Crear compte', diff --git a/lang/de_DE/setup.php b/lang/de_DE/setup.php index e1abb11b..3ac098c7 100644 --- a/lang/de_DE/setup.php +++ b/lang/de_DE/setup.php @@ -44,7 +44,7 @@ 'account_setup.name' => 'Bitte geben Sie Ihren Namen ein', 'account_setup.email' => 'Geben Sie Ihre E-Mail-Adresse ein', 'account_setup.password' => 'Ein starkes Passwort eingeben', - 'account_setup.password_requirements' => 'Mindestlänge: 10 Zeichen', + 'account_setup.password_requirements' => 'Mindestlänge: 8 Zeichen', 'account_setup.password_confirmed' => 'Passwort bestätigen', 'account_setup.create' => 'Konto erstellen', diff --git a/lang/en_US/setup.php b/lang/en_US/setup.php index 8a4aa028..9b23679c 100644 --- a/lang/en_US/setup.php +++ b/lang/en_US/setup.php @@ -44,7 +44,7 @@ 'account_setup.name' => 'Enter your name', 'account_setup.email' => 'Enter your email address', 'account_setup.password' => 'Enter a strong password', - 'account_setup.password_requirements' => 'Minimum length: 10 characters', + 'account_setup.password_requirements' => 'Minimum length: 8 characters', 'account_setup.password_confirmed' => 'Confirm your password', 'account_setup.create' => 'Create account', diff --git a/lang/es_ES/setup.php b/lang/es_ES/setup.php index a368a6ca..048edc46 100644 --- a/lang/es_ES/setup.php +++ b/lang/es_ES/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Introduzca su nombre', 'account_setup.email' => 'Introduzca su dirección de correo', 'account_setup.password' => 'Introduzca una contraseña segura', - 'account_setup.password_requirements' => 'Longitud mínima: 10 caracteres', + 'account_setup.password_requirements' => 'Longitud mínima: 8 caracteres', 'account_setup.password_confirmed' => 'Confirme su contraseña', 'account_setup.create' => 'Crear cuenta', diff --git a/lang/fr_FR/setup.php b/lang/fr_FR/setup.php index 61b6672b..c23ac909 100644 --- a/lang/fr_FR/setup.php +++ b/lang/fr_FR/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Entrez votre nom', 'account_setup.email' => 'Entrez votre adresse e-mail', 'account_setup.password' => 'Entrez un mot de passe fort', - 'account_setup.password_requirements' => 'Longueur minimale : 10 caractères', + 'account_setup.password_requirements' => 'Longueur minimale : 8 caractères', 'account_setup.password_confirmed' => 'Confirmez votre mot de passe', 'account_setup.create' => 'Créer un compte', diff --git a/lang/hu_HU/setup.php b/lang/hu_HU/setup.php index 489cdb6a..f6501d0d 100644 --- a/lang/hu_HU/setup.php +++ b/lang/hu_HU/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Adja meg a nevét', 'account_setup.email' => 'Adja meg az e-mail-címét', 'account_setup.password' => 'Adjon meg egy erős jelszót', - 'account_setup.password_requirements' => 'Minimális hossz: 10 karakter', + 'account_setup.password_requirements' => 'Minimális hossz: 8 karakter', 'account_setup.password_confirmed' => 'Jelszó megerősítése', 'account_setup.create' => 'Fiók létrehozása', diff --git a/lang/it_IT/setup.php b/lang/it_IT/setup.php index 8aafc740..44dca763 100644 --- a/lang/it_IT/setup.php +++ b/lang/it_IT/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Inserisci il tuo nome', 'account_setup.email' => 'Inserisci il tuo indirizzo email', 'account_setup.password' => 'Inserisci una password robusta', - 'account_setup.password_requirements' => 'Lunghezza minima: 10 caratteri', + 'account_setup.password_requirements' => 'Lunghezza minima: 8 caratteri', 'account_setup.password_confirmed' => 'Conferma la tua password', 'account_setup.create' => 'Crea account', diff --git a/lang/no_NO/setup.php b/lang/no_NO/setup.php index 8ea4c790..ae4ec632 100644 --- a/lang/no_NO/setup.php +++ b/lang/no_NO/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Oppgi ditt navn', 'account_setup.email' => 'Oppgi din e-postadresse', 'account_setup.password' => 'Angi et sterkt passord', - 'account_setup.password_requirements' => 'Minimumslengde: 10 tegn', + 'account_setup.password_requirements' => 'Minimumslengde: 8 tegn', 'account_setup.password_confirmed' => 'Bekreft passordet', 'account_setup.create' => 'Opprett konto', diff --git a/lang/pl_PL/setup.php b/lang/pl_PL/setup.php index 2eabc5a4..e5f07342 100644 --- a/lang/pl_PL/setup.php +++ b/lang/pl_PL/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Wprowadź swoje imię', 'account_setup.email' => 'Wprowadź swój adres email', 'account_setup.password' => 'Wprowadź silne hasło', - 'account_setup.password_requirements' => 'Minimalna długość: 10 znaków', + 'account_setup.password_requirements' => 'Minimalna długość: 8 znaków', 'account_setup.password_confirmed' => 'Potwierdź swoje hasło', 'account_setup.create' => 'Utwórz konto', diff --git a/lang/ro_RO/setup.php b/lang/ro_RO/setup.php index 872ef081..cf1988d1 100644 --- a/lang/ro_RO/setup.php +++ b/lang/ro_RO/setup.php @@ -44,7 +44,7 @@ 'account_setup.name' => 'Introdu-ți numele', 'account_setup.email' => 'Introdu-ți adresa de poștă electronică', 'account_setup.password' => 'Introdu o parolă puternică', - 'account_setup.password_requirements' => 'Lungime minimă: 10 caractere', + 'account_setup.password_requirements' => 'Lungime minimă: 8 caractere', 'account_setup.password_confirmed' => 'Confirmă-ți parola', 'account_setup.create' => 'Creare cont', diff --git a/lang/vi_VN/setup.php b/lang/vi_VN/setup.php index a25dbf87..5613cd86 100644 --- a/lang/vi_VN/setup.php +++ b/lang/vi_VN/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Nhập tên của bạn', 'account_setup.email' => 'Nhập địa chỉ email của bạn', 'account_setup.password' => 'Nhập 1 mật khẩu mạnh', - 'account_setup.password_requirements' => 'Dài tối thiểu: 10 ký tự', + 'account_setup.password_requirements' => 'Dài tối thiểu: 8 ký tự', 'account_setup.password_confirmed' => 'Xác nhận mật khẩu của bạn', 'account_setup.create' => 'Tạo tài khoản', diff --git a/lang/zh_CN/setup.php b/lang/zh_CN/setup.php index b800a361..682358bc 100644 --- a/lang/zh_CN/setup.php +++ b/lang/zh_CN/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => '输入您的名称', 'account_setup.email' => '输入您电子邮箱', 'account_setup.password' => '输入较强的密码。', - 'account_setup.password_requirements' => '最小长度：10 个字符', + 'account_setup.password_requirements' => '最小长度：8 个字符', 'account_setup.password_confirmed' => '确认您的密码', 'account_setup.create' => '创建帐户', diff --git a/tests/Commands/ResetPasswordCommandTest.php b/tests/Commands/ResetPasswordCommandTest.php index 9137df2f..57e9c02c 100644 --- a/tests/Commands/ResetPasswordCommandTest.php +++ b/tests/Commands/ResetPasswordCommandTest.php @@ -20,7 +20,7 @@ public function testCommand(): void ->expectsOutput('A user with this email address could not be found!') ->expectsQuestion('Please enter the user email address', 'test@linkace.org') ->expectsQuestion('Please enter a new password for this user', 'test') - ->expectsOutput('The password must be at least 10 characters.') + ->expectsOutput('The password must be at least 8 characters.') ->expectsQuestion('Please enter a new password for this user', 'longtestpassword') ->expectsOutput('Password successfully changed. You can now login.') ->assertExitCode(0); From 6543d215a36a27efd50888f4b6bd5ca856723321 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Tue, 7 May 2024 21:00:40 -0500 Subject: [PATCH 3/5] revert translations --- lang/ca_ES/setup.php | 2 +- lang/de_DE/setup.php | 2 +- lang/es_ES/setup.php | 2 +- lang/fr_FR/setup.php | 2 +- lang/hu_HU/setup.php | 2 +- lang/it_IT/setup.php | 2 +- lang/no_NO/setup.php | 2 +- lang/pl_PL/setup.php | 2 +- lang/ro_RO/setup.php | 2 +- lang/zh_CN/setup.php | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lang/ca_ES/setup.php b/lang/ca_ES/setup.php index df723540..557dab30 100644 --- a/lang/ca_ES/setup.php +++ b/lang/ca_ES/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Introdueix el teu nom', 'account_setup.email' => 'Introdueix el teu correu electrònic', 'account_setup.password' => 'Introdueix una contrasenya forta', - 'account_setup.password_requirements' => 'Longitud mínima: 8 caràcters', + 'account_setup.password_requirements' => 'Longitud mínima: 10 caràcters', 'account_setup.password_confirmed' => 'Confirma la teva contrasenya', 'account_setup.create' => 'Crear compte', diff --git a/lang/de_DE/setup.php b/lang/de_DE/setup.php index 3ac098c7..e1abb11b 100644 --- a/lang/de_DE/setup.php +++ b/lang/de_DE/setup.php @@ -44,7 +44,7 @@ 'account_setup.name' => 'Bitte geben Sie Ihren Namen ein', 'account_setup.email' => 'Geben Sie Ihre E-Mail-Adresse ein', 'account_setup.password' => 'Ein starkes Passwort eingeben', - 'account_setup.password_requirements' => 'Mindestlänge: 8 Zeichen', + 'account_setup.password_requirements' => 'Mindestlänge: 10 Zeichen', 'account_setup.password_confirmed' => 'Passwort bestätigen', 'account_setup.create' => 'Konto erstellen', diff --git a/lang/es_ES/setup.php b/lang/es_ES/setup.php index 048edc46..a368a6ca 100644 --- a/lang/es_ES/setup.php +++ b/lang/es_ES/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Introduzca su nombre', 'account_setup.email' => 'Introduzca su dirección de correo', 'account_setup.password' => 'Introduzca una contraseña segura', - 'account_setup.password_requirements' => 'Longitud mínima: 8 caracteres', + 'account_setup.password_requirements' => 'Longitud mínima: 10 caracteres', 'account_setup.password_confirmed' => 'Confirme su contraseña', 'account_setup.create' => 'Crear cuenta', diff --git a/lang/fr_FR/setup.php b/lang/fr_FR/setup.php index c23ac909..61b6672b 100644 --- a/lang/fr_FR/setup.php +++ b/lang/fr_FR/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Entrez votre nom', 'account_setup.email' => 'Entrez votre adresse e-mail', 'account_setup.password' => 'Entrez un mot de passe fort', - 'account_setup.password_requirements' => 'Longueur minimale : 8 caractères', + 'account_setup.password_requirements' => 'Longueur minimale : 10 caractères', 'account_setup.password_confirmed' => 'Confirmez votre mot de passe', 'account_setup.create' => 'Créer un compte', diff --git a/lang/hu_HU/setup.php b/lang/hu_HU/setup.php index f6501d0d..489cdb6a 100644 --- a/lang/hu_HU/setup.php +++ b/lang/hu_HU/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Adja meg a nevét', 'account_setup.email' => 'Adja meg az e-mail-címét', 'account_setup.password' => 'Adjon meg egy erős jelszót', - 'account_setup.password_requirements' => 'Minimális hossz: 8 karakter', + 'account_setup.password_requirements' => 'Minimális hossz: 10 karakter', 'account_setup.password_confirmed' => 'Jelszó megerősítése', 'account_setup.create' => 'Fiók létrehozása', diff --git a/lang/it_IT/setup.php b/lang/it_IT/setup.php index 44dca763..8aafc740 100644 --- a/lang/it_IT/setup.php +++ b/lang/it_IT/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Inserisci il tuo nome', 'account_setup.email' => 'Inserisci il tuo indirizzo email', 'account_setup.password' => 'Inserisci una password robusta', - 'account_setup.password_requirements' => 'Lunghezza minima: 8 caratteri', + 'account_setup.password_requirements' => 'Lunghezza minima: 10 caratteri', 'account_setup.password_confirmed' => 'Conferma la tua password', 'account_setup.create' => 'Crea account', diff --git a/lang/no_NO/setup.php b/lang/no_NO/setup.php index ae4ec632..8ea4c790 100644 --- a/lang/no_NO/setup.php +++ b/lang/no_NO/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Oppgi ditt navn', 'account_setup.email' => 'Oppgi din e-postadresse', 'account_setup.password' => 'Angi et sterkt passord', - 'account_setup.password_requirements' => 'Minimumslengde: 8 tegn', + 'account_setup.password_requirements' => 'Minimumslengde: 10 tegn', 'account_setup.password_confirmed' => 'Bekreft passordet', 'account_setup.create' => 'Opprett konto', diff --git a/lang/pl_PL/setup.php b/lang/pl_PL/setup.php index e5f07342..2eabc5a4 100644 --- a/lang/pl_PL/setup.php +++ b/lang/pl_PL/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Wprowadź swoje imię', 'account_setup.email' => 'Wprowadź swój adres email', 'account_setup.password' => 'Wprowadź silne hasło', - 'account_setup.password_requirements' => 'Minimalna długość: 8 znaków', + 'account_setup.password_requirements' => 'Minimalna długość: 10 znaków', 'account_setup.password_confirmed' => 'Potwierdź swoje hasło', 'account_setup.create' => 'Utwórz konto', diff --git a/lang/ro_RO/setup.php b/lang/ro_RO/setup.php index cf1988d1..872ef081 100644 --- a/lang/ro_RO/setup.php +++ b/lang/ro_RO/setup.php @@ -44,7 +44,7 @@ 'account_setup.name' => 'Introdu-ți numele', 'account_setup.email' => 'Introdu-ți adresa de poștă electronică', 'account_setup.password' => 'Introdu o parolă puternică', - 'account_setup.password_requirements' => 'Lungime minimă: 8 caractere', + 'account_setup.password_requirements' => 'Lungime minimă: 10 caractere', 'account_setup.password_confirmed' => 'Confirmă-ți parola', 'account_setup.create' => 'Creare cont', diff --git a/lang/zh_CN/setup.php b/lang/zh_CN/setup.php index 682358bc..b800a361 100644 --- a/lang/zh_CN/setup.php +++ b/lang/zh_CN/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => '输入您的名称', 'account_setup.email' => '输入您电子邮箱', 'account_setup.password' => '输入较强的密码。', - 'account_setup.password_requirements' => '最小长度：8 个字符', + 'account_setup.password_requirements' => '最小长度：10 个字符', 'account_setup.password_confirmed' => '确认您的密码', 'account_setup.create' => '创建帐户', From 724c1b0b3d0515cb0176d57176dc5aba677bef4b Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Tue, 7 May 2024 21:02:19 -0500 Subject: [PATCH 4/5] revert Vietnamese translation --- lang/vi_VN/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/vi_VN/setup.php b/lang/vi_VN/setup.php index 5613cd86..a25dbf87 100644 --- a/lang/vi_VN/setup.php +++ b/lang/vi_VN/setup.php @@ -43,7 +43,7 @@ 'account_setup.name' => 'Nhập tên của bạn', 'account_setup.email' => 'Nhập địa chỉ email của bạn', 'account_setup.password' => 'Nhập 1 mật khẩu mạnh', - 'account_setup.password_requirements' => 'Dài tối thiểu: 8 ký tự', + 'account_setup.password_requirements' => 'Dài tối thiểu: 10 ký tự', 'account_setup.password_confirmed' => 'Xác nhận mật khẩu của bạn', 'account_setup.create' => 'Tạo tài khoản', From 1db2ab5e9735e7edc116ccfcd2a373b364ff7db8 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Wed, 8 May 2024 09:06:44 -0500 Subject: [PATCH 5/5] Match minimum password length in validator for reset-password artisan command --- app/Console/Commands/ResetPasswordCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/ResetPasswordCommand.php b/app/Console/Commands/ResetPasswordCommand.php index 2d24d6e4..af4c687a 100644 --- a/app/Console/Commands/ResetPasswordCommand.php +++ b/app/Console/Commands/ResetPasswordCommand.php @@ -27,7 +27,7 @@ protected function resetUserPassword(): void $newPassword = $this->secret('Please enter a new password for this user'); $validator = Validator::make(['password' => $newPassword], [ - 'password' => 'required|string|min:10', + 'password' => 'required|string|min:8', ]); if ($validator->invalid()) {