Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
majora2007 committed Jul 25, 2021
2 parents d97e81d + 42cc000 commit 9dfb1a3
Show file tree
Hide file tree
Showing 4 changed files with 99 additions and 0 deletions.
17 changes: 17 additions & 0 deletions API/Data/Seed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using API.Services;
using Kavita.Common;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;

namespace API.Data
{
Expand Down Expand Up @@ -69,5 +70,21 @@ public static async Task SeedSettings(DataContext context)
await context.SaveChangesAsync();

}

public static async Task SeedSeriesMetadata(DataContext context)
{
await context.Database.EnsureCreatedAsync();

context.Database.EnsureCreated();
var series = await context.Series
.Include(s => s.Metadata).ToListAsync();

foreach (var s in series)
{
s.Metadata ??= new SeriesMetadata();
}

await context.SaveChangesAsync();
}
}
}
28 changes: 28 additions & 0 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#This Dockerfile is for the musl alpine build of Kavita.
FROM alpine:latest

MAINTAINER Chris P

#Installs the needed dependencies
RUN apk update && apk add --no-cache wget curl pwgen icu-dev bash

#Downloads Kavita, unzips and moves the folders to where they need to be
RUN wget https://github.com/Kareadita/Kavita/releases/download/v0.3.7/kavita-linux-musl-x64.tar.gz \
&& tar -xzf kavita*.tar.gz \
&& mv Kavita/ /kavita/ \
&& rm kavita*.gz \
&& chmod +x /kavita/Kavita

#Creates the needed folders
RUN mkdir /manga /kavita/data /kavita/temp /kavita/cache

RUN sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json

COPY entrypoint.sh /entrypoint.sh

EXPOSE 5000

WORKDIR /kavita

ENTRYPOINT ["/bin/bash"]
CMD ["/entrypoint.sh"]
27 changes: 27 additions & 0 deletions Dockerfile.arm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#This Dockerfile pulls the latest git commit and builds Kavita from source

#Production image
FROM ubuntu:focal

#Move the output files to where they need to be
COPY Kavita /kavita

#Installs program dependencies
RUN apt-get update \
&& apt-get install -y libicu-dev libssl1.1 pwgen \
&& rm -rf /var/lib/apt/lists/*

#Creates the manga storage directory
RUN mkdir /kavita/data

RUN cp /kavita/appsettings.Development.json /kavita/appsettings.json \
&& sed -i 's/Data source=kavita.db/Data source=data\/kavita.db/g' /kavita/appsettings.json

COPY entrypoint.sh /entrypoint.sh

EXPOSE 5000

WORKDIR /kavita

ENTRYPOINT ["/bin/bash"]
CMD ["/entrypoint.sh"]
27 changes: 27 additions & 0 deletions build_target.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash

mkdir Projects

cd Projects

git clone https://github.com/Kareadita/Kavita.git
git clone https://github.com/Kareadita/Kavita-webui.git

cd Kavita
chmod +x build.sh

#Builds program based on the target platform

if [ "$TARGETPLATFORM" == "linux/amd64" ]
then
./build.sh linux-x64
mv /Projects/Kavita/_output/linux-x64 /Projects/Kavita/_output/build
elif [ "$TARGETPLATFORM" == "linux/arm/v7" ]
then
./build.sh linux-arm
mv /Projects/Kavita/_output/linux-arm /Projects/Kavita/_output/build
elif [ "$TARGETPLATFORM" == "linux/arm64" ]
then
./build.sh linux-arm64
mv /Projects/Kavita/_output/linux-arm64 /Projects/Kavita/_output/build
fi

0 comments on commit 9dfb1a3

Please sign in to comment.