Merge branch 'develop' of https://github.com/Kareadita/Kavita into develop

This commit is contained in:
Joseph Milazzo 2021-06-03 08:31:40 -05:00
commit ec0327272f
3 changed files with 22 additions and 19 deletions

View File

@ -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 }}

View File

@ -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; }
}

View File

@ -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; }
}
}