Optimize for size

Author: Nachtalb

.github/workflows/docker-publish.yml

@@ -1,4 +1,4 @@
-name: Docker
+name: Docker Build and Push
 
 on:
   push:
@@ -35,35 +35,35 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract metadata for Docker
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
-            type=sha,format=short
-            type=ref,event=branch
-            type=ref,event=tag
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
           context: .
+          platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
           push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
 
-      - name: Build and push architecture-specific tags
+      - name: Create and push architecture-specific tags
         if: github.event_name != 'pull_request'
         run: |
-          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8 | tr '[:upper:]' '[:lower:]')
-          REPO_LOWER=$(echo ${{ env.IMAGE_NAME }} | tr '[:upper:]' '[:lower:]')
-          for arch in amd64 arm64 arm-v7; do
-            docker buildx build --platform linux/${arch//-/\/} \
+          REPO_LOWER=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
+          SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
+
+          for arch in amd64 arm32v7 arm64v8; do
+            case $arch in
+              amd64)   platform="linux/amd64" ;;
+              arm32v7) platform="linux/arm/v7" ;;
+              arm64v8) platform="linux/arm64/v8" ;;
+            esac
+
+            docker buildx build --platform $platform \
               -t ${{ env.REGISTRY }}/${REPO_LOWER}:latest-${arch} \
               -t ${{ env.REGISTRY }}/${REPO_LOWER}:${SHORT_SHA}-${arch} \
               --push \

Dockerfile

@@ -1,39 +1,67 @@
 # Specify the base image for the build stage
 ARG DOTNET_VERSION=6.0
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-alpine AS build
 ARG TARGETARCH
 ARG TARGETVARIANT
 WORKDIR /app
 
-# Copy everything and restore as distinct layers
-COPY . ./
-RUN dotnet restore Tv7Playlist.sln
+# Copy csproj and restore as distinct layers
+COPY ["Tv7Playlist/Tv7Playlist.csproj", "Tv7Playlist/"]
+COPY ["Tv7Playlist.Core/Tv7Playlist.Core.csproj", "Tv7Playlist.Core/"]
+COPY ["Tv7Playlist.Data/Tv7Playlist.Data.csproj", "Tv7Playlist.Data/"]
+RUN dotnet restore "Tv7Playlist/Tv7Playlist.csproj"
 
+# Copy everything else and build
+COPY . .
 # Build and publish
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-        RID=linux-x64; \
+        RID=linux-musl-x64; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
-        RID=linux-arm64; \
+        RID=linux-musl-arm64; \
     elif [ "$TARGETARCH" = "arm" ] && [ "$TARGETVARIANT" = "v7" ]; then \
-        RID=linux-arm; \
-    elif [ "$TARGETARCH" = "386" ]; then \
-        RID=linux-x86; \
+        RID=linux-musl-arm; \
     else \
         echo "Unsupported architecture: $TARGETARCH$TARGETVARIANT"; \
         exit 1; \
     fi && \
-    dotnet publish -c Release -o out --no-restore --self-contained false -r $RID Tv7Playlist.sln
+    echo "Building for RID: $RID" && \
+    dotnet publish Tv7Playlist/Tv7Playlist.csproj -c Release -o out --no-restore \
+    --self-contained true \
+    -r $RID \
+    /p:PublishSingleFile=true \
+    /p:PublishTrimmed=false \
+    /p:IncludeNativeLibrariesForSelfExtract=true \
+    /p:InvariantGlobalization=true \
+    /p:UseSystemResourceKeys=true \
+    /p:IlcGenerateStackTraceData=false \
+    /p:IlcOptimizationPreference=Size \
+    /p:IlcDisableReflection=false \
+    /p:DebugType=None \
+    /p:DebugSymbols=false \
+    /p:StripSymbols=true \
+    /p:EnableCompressionInSingleFile=true
 
-# Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:${DOTNET_VERSION}
+# Runtime stage
+FROM mcr.microsoft.com/dotnet/runtime-deps:${DOTNET_VERSION}-alpine
 WORKDIR /app
-RUN mkdir /data
-
 COPY --from=build /app/out .
 
+# Remove unnecessary files
+RUN find . -name '*.pdb' -type f -delete && \
+    find . -name '*.xml' -type f -delete && \
+    rm -rf *.dev.json
+
+# Create a non-root user and set up permissions
+RUN adduser -u 5678 --disabled-password --gecos "" appuser && \
+    mkdir -p /app/data && \
+    chown -R appuser:appuser /app
+
+USER appuser
+
 ENV ASPNETCORE_URLS=http://+:80
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
 EXPOSE 80
 
-VOLUME [ "/data" ]
+VOLUME [ "/app/data" ]
 
-ENTRYPOINT ["dotnet", "Tv7Playlist.dll"]
+ENTRYPOINT ["./Tv7Playlist"]

Tv7Playlist.Core/Tv7Playlist.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifiers>linux-x64;linux-arm64;linux-arm;linux-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-musl-x64;linux-musl-arm64;linux-musl-arm</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />

Tv7Playlist.Data/Tv7Playlist.Data.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifiers>linux-x64;linux-arm64;linux-arm;linux-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-musl-x64;linux-musl-arm64;linux-musl-arm</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />

Tv7Playlist/Tv7Playlist.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <LangVersion>latest</LangVersion>
-    <RuntimeIdentifiers>linux-x64;linux-arm64;linux-arm;linux-x86</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-musl-x64;linux-musl-arm64;linux-musl-arm</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />

Tv7Playlist/appsettings.json

@@ -8,7 +8,7 @@
   },
   "AllowedHosts": "*",
   "SourceType": "Xspf",
-  "SqLiteConnectionString": "Data Source=/data/playlist.db",
+  "SqLiteConnectionString": "Data Source=/app/data/playlist.db",
   "TV7Url": "https://api.init7.net/tvchannels.xspf",
   "UdpxyUrl": "http://192.168.15.2:4022/udp",
   "DownloadFileName": "PlaylistTV7udpxy.m3u"