Merge pull request #381 from lanedirt/372-installsh-reset-password-th…

…rows-sed-notice-error Fix bug in reset-password regex check
lanedirt · Nov 18, 2024 · 64a76f3 · 64a76f3
2 parents 63556d1 + 7c1aaab
commit 64a76f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/docker-compose-build.yml b/.github/workflows/docker-compose-build.yml
@@ -91,8 +91,8 @@ jobs:
       - name: Test install.sh reset-password output
         run: |
           output=$(./install.sh reset-password)
-          if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9]{8,}.*'; then
-            echo "Password reset output format is incorrect. Expected format: 'New admin password: <at least 8 chars>'"
+          if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9+/=]{8,}.*'; then
+            echo "Password reset output format is incorrect. Expected format: 'New admin password: <at least 8 base64 chars>'"
             echo "Actual output: $output"
             exit 1
           else

diff --git a/.github/workflows/docker-compose-pull.yml b/.github/workflows/docker-compose-pull.yml
@@ -91,7 +91,7 @@ jobs:
       - name: Test install.sh reset-password output
         run: |
           output=$(./install.sh reset-password)
-          if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9]{8,}.*'; then
+          if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9+/=]{8,}.*'; then
             echo "Password reset output format is incorrect. Expected format: 'New admin password: <at least 8 base64 chars>'"
             echo "Actual output: $output"
             exit 1