Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minimum length password wording (character number) #792

Merged
merged 6 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
```
2 changes: 1 addition & 1 deletion lang/en_US/setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions resources/docker/dockerfiles/release-multiplatform.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/Commands/ResetPasswordCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down