From 6c67f73898eaaad5110a7c45fbdde7fb35a1d027 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Wed, 2 Jun 2021 07:49:33 -0500 Subject: [PATCH 1/3] Chore/docker build (#245) * Added a docker script for nightly builds. --- .github/workflows/nightly-docker.yml | 37 +++++++++++++++------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index 5129ba8b2..c42f0a5eb 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -1,33 +1,36 @@ -name: ci +name: CI to Docker Hub on: push: branches: - - 'master' + - 'develop' jobs: docker: runs-on: ubuntu-latest steps: - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub + + - name: Check Out Repo + uses: actions/checkout@v2 + + - name: Login to Docker Hub uses: docker/login-action@v1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + + - name: Build and push id: docker_build uses: docker/build-push-action@v2 with: + context: ./ + file: ./Dockerfile push: true - tags: user/app:latest - - - name: Image digest + tags: kizaing/kavita:nightly-amd64 + + - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file From 16d6b26c63c521b1ab6c619be5f6f39588f37eca Mon Sep 17 00:00:00 2001 From: Leonardo Dias Date: Thu, 3 Jun 2021 09:16:32 -0300 Subject: [PATCH 2/3] fix: wrong password length validation when registering a new user or resetting password (#247) #244 Co-authored-by: leo2d --- API/DTOs/RegisterDto.cs | 2 +- API/DTOs/ResetPasswordDto.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/API/DTOs/RegisterDto.cs b/API/DTOs/RegisterDto.cs index bcc93954f..d04c2a03e 100644 --- a/API/DTOs/RegisterDto.cs +++ b/API/DTOs/RegisterDto.cs @@ -7,7 +7,7 @@ namespace API.DTOs [Required] public string Username { get; init; } [Required] - [StringLength(32, MinimumLength = 4)] + [StringLength(32, MinimumLength = 6)] public string Password { get; init; } public bool IsAdmin { get; init; } } diff --git a/API/DTOs/ResetPasswordDto.cs b/API/DTOs/ResetPasswordDto.cs index 535d0df2f..4b3ee3580 100644 --- a/API/DTOs/ResetPasswordDto.cs +++ b/API/DTOs/ResetPasswordDto.cs @@ -7,7 +7,7 @@ namespace API.DTOs [Required] public string UserName { get; init; } [Required] - [StringLength(16, MinimumLength = 4)] + [StringLength(32, MinimumLength = 6)] public string Password { get; init; } } } \ No newline at end of file From 863bc57e874e4e39dde7f6a72a82f522e60d09a9 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Thu, 3 Jun 2021 08:31:23 -0500 Subject: [PATCH 3/3] Docker Build Turn off (#248) Turn off the Docker Build CI stuff, will look into it later. Changed pagination default to 30 and version bump.