chore: better cleanuparr build - includes all assets (fonts icons)

iPromKnight · iPromKnight · commit 55e10795e76e · 2025-08-23T16:31:56.000+01:00
diff --git a/.github/actions/build-release-image/action.yaml b/.github/actions/build-release-image/action.yaml
@@ -36,6 +36,9 @@ inputs:
   token:
     required: true
     description: "GitHub token for authentication"
+  public_token:
+    required: true
+    description: "GitHub token for authentication (public packages)"
 
 runs:
   using: composite
@@ -52,7 +55,11 @@ runs:
 
     - name: Build and push image
       uses: docker/build-push-action@v6
+      env:
+        PUBLIC_TOKEN: ${{ inputs.public_token }}
       with:
+        secrets: |
+          id=PUBLIC_TOKEN,env=PUBLIC_TOKEN
         build-args: |
           VERSION=${{ inputs.upstream_version }}
           CHANNEL=${{ inputs.channel }}
diff --git a/.github/actions/build-test-image/action.yaml b/.github/actions/build-test-image/action.yaml
@@ -17,6 +17,9 @@ inputs:
   tag_testing:
     required: true
     description: "Tag for testing"
+  public_token:
+    required: true
+    description: "Github token for authentication (public packages)"
 
 runs:
   using: composite
@@ -26,7 +29,11 @@ runs:
 
     - name: Build Docker image (test)
       uses: docker/build-push-action@v6
+      env:
+        PUBLIC_TOKEN: ${{ inputs.public_token }}
       with:
+        secrets: |
+          id=PUBLIC_TOKEN,env=PUBLIC_TOKEN
         build-args: |
           VERSION=${{ inputs.upstream_version }}
           CHANNEL=${{ inputs.channel }}
diff --git a/.github/workflows/ci-cd.yaml b/.github/workflows/ci-cd.yaml
@@ -114,6 +114,7 @@ jobs:
           upstream_version: ${{ steps.vars.outputs.chan_upstream_version }}
           dockerfile: ${{ steps.vars.outputs.chan_dockerfile }}
           tag_testing: ${{ steps.vars.outputs.chan_tag_testing }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
 
       - name: Run Goss tests
         if: ${{ steps.vars.outputs.chan_tests_enabled == 'true' }}
@@ -136,6 +137,7 @@ jobs:
           tag_version: ${{ steps.vars.outputs.chan_tag_version }}
           platforms: ${{ steps.vars.outputs.chan_platforms }}
           token: ${{ secrets.GH_PAT }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
     
   notify-success:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/manual-release-all.yaml b/.github/workflows/manual-release-all.yaml
@@ -81,6 +81,7 @@ jobs:
           upstream_version: ${{ steps.vars.outputs.chan_upstream_version }}
           dockerfile: ${{ steps.vars.outputs.chan_dockerfile }}
           tag_testing: ${{ steps.vars.outputs.chan_tag_testing }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
 
       - name: Run Goss tests
         if: ${{ env.DRY_RUN != 'true' && steps.vars.outputs.chan_tests_enabled == 'true' }}
@@ -104,6 +105,7 @@ jobs:
           tag_version: ${{ steps.vars.outputs.chan_tag_version }}
           platforms: ${{ steps.vars.outputs.chan_platforms }}
           token: ${{ secrets.GH_PAT }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
           
   notify-success:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/schedule-release.yaml b/.github/workflows/schedule-release.yaml
@@ -83,6 +83,7 @@ jobs:
           upstream_version: ${{ steps.vars.outputs.chan_upstream_version }}
           dockerfile: ${{ steps.vars.outputs.chan_dockerfile }}
           tag_testing: ${{ steps.vars.outputs.chan_tag_testing }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
 
       - name: Run Goss tests
         if: ${{ env.DRY_RUN != 'true' && steps.vars.outputs.chan_tests_enabled == 'true' }}
@@ -106,6 +107,7 @@ jobs:
           tag_version: ${{ steps.vars.outputs.chan_tag_version }}
           platforms: ${{ steps.vars.outputs.chan_platforms }}
           token: ${{ secrets.GH_PAT }}
+          public_token: ${{ secrets.PUBLIC_PACKAGES }}
           
   notify-success:
     runs-on: ubuntu-latest
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -21,12 +21,14 @@ tasks:
         -t {{.APP}}:{{.CHANNEL}}
         --build-arg CHANNEL={{.CHANNEL}}
         --build-arg VERSION={{.VERSION}}
+        {{if ne .PUBLIC_TOKEN ""}}--secret id=PUBLIC_TOKEN,env=PUBLIC_TOKEN{{end}}
         -f ./apps/{{.APP}}/Dockerfile .
       - >-
         ./.goss/dgoss run {{.APP}}:{{.CHANNEL}} {{if eq .BASE "true"}}tail -f /dev/null{{end}}
     vars:
       VERSION:
         sh: bash ./.github/scripts/upstream.sh "{{.APP}}" "{{.CHANNEL}}"
+      PUBLIC_TOKEN: '{{.PUBLIC_TOKEN | default ""}}'
     env:
       CONTAINER_RUNTIME: docker
       GOSS_PATH: ./.goss/goss
@@ -47,6 +49,7 @@ tasks:
         -t {{.APP}}:{{.CHANNEL}}
         --build-arg CHANNEL={{.CHANNEL}}
         --build-arg VERSION={{.VERSION}}
+        {{if ne .PUBLIC_TOKEN ""}}--secret id=PUBLIC_TOKEN,env=PUBLIC_TOKEN{{end}}
         -f ./apps/{{.APP}}/Dockerfile .
       - >-
         ./.goss/dgoss run
@@ -57,6 +60,7 @@ tasks:
     vars:
       VERSION:
         sh: bash ./.github/scripts/upstream.sh "{{.APP}}" "{{.CHANNEL}}"
+      PUBLIC_TOKEN: '{{.PUBLIC_TOKEN | default ""}}'
       SKIP_STARTUP: '{{.SKIP_STARTUP | default "false"}}'
     env:
       CONTAINER_RUNTIME: docker
diff --git a/apps/cleanuparr/Dockerfile b/apps/cleanuparr/Dockerfile
@@ -3,14 +3,48 @@ FROM alpine AS cloner
 ARG VERSION
 ARG DOTNET_VERSION="9.0.8"
 
-RUN mkdir -p /app && \
-    apk add --update --no-cache wget && \
-    wget -O /tmp/cleanuparr.zip https://github.com/Cleanuparr/Cleanuparr/releases/download/v${VERSION}/Cleanuparr-${VERSION}-linux-amd64.zip && \
-    unzip -o /tmp/cleanuparr.zip -d /app && \
-    mv /app/*/* /app/ 2>/dev/null || true && \
-    chmod +x /app/Cleanuparr && \
-    rm -rf /tmp/cleanuparr*
+RUN apk add --update --no-cache git
 
+RUN mkdir -p /src || exit 1 \
+    && git clone --depth 1 --branch v${VERSION} https://github.com/Cleanuparr/Cleanuparr.git /src
+
+# Build Angular frontend
+FROM --platform=$BUILDPLATFORM node:18-alpine AS frontend-build
+WORKDIR /app
+COPY --from=cloner /src/code/frontend/package*.json ./
+RUN npm ci && npm install -g @angular/cli
+COPY --from=cloner /src/code/frontend/ .
+RUN npm run build
+
+# Build .NET backend
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim AS build
+ARG TARGETARCH
+ARG VERSION=0.0.1
+ARG PACKAGES_USERNAME=ipromknight
+WORKDIR /app
+COPY --from=cloner /src/code/backend/ ./backend/
+
+RUN --mount=type=secret,id=PUBLIC_TOKEN \
+    dotnet nuget add source \
+      --name Cleanuparr \
+      --username "${PACKAGES_USERNAME}" \
+      --password "$(cat /run/secrets/PUBLIC_TOKEN)" \
+      --store-password-in-clear-text \
+      https://nuget.pkg.github.com/Cleanuparr/index.json \
+ && dotnet restore -a $TARGETARCH ./backend/Cleanuparr.Api/Cleanuparr.Api.csproj \
+ && dotnet nuget remove source Cleanuparr \
+ && rm -f /root/.nuget/NuGet/NuGet.Config
+    
+RUN dotnet publish ./backend/Cleanuparr.Api/Cleanuparr.Api.csproj \
+    -a $TARGETARCH \
+    -c Release \
+    -o /app/publish \
+    --no-restore \
+    /p:Version=${VERSION} \
+    /p:PublishSingleFile=true \
+    /p:DebugSymbols=false
+
+# Final stage
 FROM ghcr.io/ipromknight/ubuntu:rolling
 
 ARG DOTNET_VERSION="9.0.8"
@@ -42,13 +76,13 @@ RUN dotnet_archive=dotnet-runtime-${DOTNET_VERSION}-linux-x64.tar.gz \
 LABEL org.opencontainers.image.title="Cleanuparr"
 
 WORKDIR /app
-COPY --from=cloner --chown=568:568 /app .
+COPY --from=build --chown=568:568 /app/publish .
+COPY --from=frontend-build --chown=568:568 /app/dist/ui/browser ./wwwroot
 COPY --chmod=0755 ./apps/cleanuparr/promknight-entrypoint.sh /promknight-entrypoint.sh
 ENV PUID=568 \
     PGID=568 \
     UMASK=022 \
     TZ=Etc/UTC \
     HTTP_PORTS=11011 \
     DOTNET_USE_POLLING_FILE_WATCHER=true \
-    SEED_USER=true
-
+    SEED_USER=true
