Merge pull request #233 from vonProteus/arm64

Added support for ARM

.dockerignore

@@ -23,3 +23,5 @@
 **/values.dev.yaml
 LICENSE
 README.md
+Manga
+settings

.github/workflows/docker-base.yml

@@ -1,43 +0,0 @@
-name: Docker Image CI
-
-on:
-  workflow_dispatch:
-    
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # https://github.com/docker/setup-qemu-action#usage
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.2.0
-
-      # https://github.com/marketplace/actions/docker-setup-buildx
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3.6.1
-      
-      # https://github.com/docker/login-action#docker-hub
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
-      # https://github.com/docker/build-push-action#multi-platform-image
-      - name: Build and push base
-        uses: docker/build-push-action@v6.6.1
-        with:
-          context: ./
-          file: ./Dockerfile-base
-          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64
-          pull: true
-          push: true
-          tags: |
-            glax/tranga-base:latest

.github/workflows/docker-image-cuttingedge.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-dev.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-master.yml

@@ -33,12 +33,12 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile
           #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           pull: true
           push: true
           tags: |

.github/workflows/docker-image-serverv2.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.gitignore

@@ -20,3 +20,6 @@ riderModule.iml
 cover.jpg
 cover.png
 /.vscode
+/Manga
+/settings
+*.DotSettings.user

Dockerfile

@@ -1,29 +1,42 @@
 # syntax=docker/dockerfile:1
+ARG DOTNET=7.0
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
+FROM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base
+WORKDIR /publish
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+RUN apt-get update \
+  && apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3 chromium \
+  && apt-get autopurge -y \
+  && apt-get autoclean -y
+
+FROM mcr.microsoft.com/dotnet/sdk:$DOTNET AS build-env
 WORKDIR /src
-COPY CLI /src/CLI
-COPY Tranga /src/Tranga
-COPY Logging /src/Logging
-COPY Tranga.sln /src
-RUN dotnet restore /src/Tranga/Tranga.csproj
-RUN dotnet publish -c Release -o /publish
 
-FROM glax/tranga-base:latest as runtime
+COPY Tranga.sln /src
+COPY CLI/CLI.csproj /src/CLI/CLI.csproj
+COPY Logging/Logging.csproj /src/Logging/Logging.csproj 
+COPY Tranga/Tranga.csproj /src/Tranga/Tranga.csproj
+RUN dotnet restore /src/Tranga.sln
+
+COPY . /src/
+RUN dotnet publish -c Release -o /publish -maxcpucount:1 
+
+FROM base AS runtime
 EXPOSE 6531
 ARG UNAME=tranga
 ARG UID=1000
 ARG GID=1000
-RUN groupadd -g $GID -o $UNAME
+RUN groupadd -g $GID -o $UNAME \
-RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
+  && useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME \
-RUN mkdir /usr/share/tranga-api
+  && mkdir /usr/share/tranga-api \
-RUN mkdir /Manga
+  && mkdir /Manga \
-RUN chown 1000:1000 /usr/share/tranga-api
+  && chown 1000:1000 /usr/share/tranga-api \
-RUN chown 1000:1000 /Manga
+  && chown 1000:1000 /Manga 
 USER $UNAME
 
 WORKDIR /publish
-COPY --from=build-env /publish .
+COPY --chown=1000:1000 --from=build-env /publish .
 USER 0
-RUN chown 1000:1000 /publish
+ENTRYPOINT ["dotnet", "/publish/Tranga.dll"]
-ENTRYPOINT ["dotnet", "/publish/Tranga.dll", "-f", "-c", "-l", "/usr/share/tranga-api/logs"]
+CMD ["-f", "-c", "-l", "/usr/share/tranga-api/logs"]

Dockerfile-base

@@ -1,8 +0,0 @@
-# syntax=docker/dockerfile:1
-#FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
-FROM mcr.microsoft.com/dotnet/runtime:7.0 as runtime
-WORKDIR /publish
-RUN apt-get update
-RUN apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3
-RUN apt-get autopurge -y
-RUN apt-get autoclean -y

Tranga/MangaConnectors/ChromiumDownloadClient.cs

@@ -13,40 +13,12 @@ internal class ChromiumDownloadClient : DownloadClient
     private const int StartTimeoutMs = 30000;
     private readonly HttpDownloadClient _httpDownloadClient;
     
-    private async Task<IBrowser> DownloadBrowser()
+    private async Task<IBrowser> StartBrowser()
     {
-        BrowserFetcher browserFetcher = new ();
-        foreach(string rev in browserFetcher.LocalRevisions().Where(rev => rev != ChromiumVersion))
-            browserFetcher.Remove(rev);
-        if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
-        {
-            Log("Downloading headless browser");
-            DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
-            browserFetcher.DownloadProgressChanged += (_, args) =>
-            {
-                double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
-                if (args.TotalBytesToReceive == args.BytesReceived)
-                    Log("Browser downloaded.");
-                else if (DateTime.Now > last.AddSeconds(1))
-                {
-                    Log($"Browser download progress: {currentBytes:P2}");
-                    last = DateTime.Now;
-                }
-
-            };
-            if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
-            {
-                Log($"Can't download browser version {ChromiumVersion}");
-                throw new Exception();
-            }
-            await browserFetcher.DownloadAsync(ChromiumVersion);
-        }
-        
         Log($"Starting Browser. ({StartTimeoutMs}ms timeout)");
         return await Puppeteer.LaunchAsync(new LaunchOptions
         {
             Headless = true,
-            ExecutablePath = browserFetcher.GetExecutablePath(ChromiumVersion),
             Args = new [] {
                 "--disable-gpu",
                 "--disable-dev-shm-usage",
@@ -58,7 +30,7 @@ internal class ChromiumDownloadClient : DownloadClient
 
     public ChromiumDownloadClient(GlobalBase clone) : base(clone)
     {
-        this.browser = DownloadBrowser().Result;
+        this.browser = StartBrowser().Result;
         _httpDownloadClient = new(this);
     }
 

docker-compose.local.yaml

@@ -0,0 +1,21 @@
+version: '3'
+services:
+  tranga-api:
+    build:
+      dockerfile: Dockerfile
+      context: .
+    container_name: tranga-api
+    volumes:
+      - ./Manga:/Manga
+      - ./settings:/usr/share/tranga-api
+    ports:
+      - "6531:6531"
+    restart: unless-stopped
+  tranga-website:
+    image: glax/tranga-website:latest
+    container_name: tranga-website
+    ports:
+      - "9555:80"
+    depends_on: 
+      - tranga-api
+    restart: unless-stopped