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/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()) { 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/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 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);