Reduce image size.

Squidex · Mar 9, 2025 · a345c97 · a345c97
1 parent 65365cc
commit a345c97
Show file tree

Hide file tree

Showing 18 changed files with 110 additions and 63 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -26,10 +26,8 @@ jobs:
         env:
           DOCKER_BUILD_RECORD_UPLOAD: false
         with:
-          load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: squidex-local
 
   test-containers:
     runs-on: ubuntu-latest
@@ -38,13 +36,13 @@ jobs:
       - name: Prepare - Checkout
         uses: actions/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
 
       - name: Test - TestContainers
-        run: dotnet test backend/Squidex.sln --filter Category==TestContainers
+        run: dotnet test backend/Squidex.sln --filter Category=TestContainers
 
   test-mongo:
     runs-on: ubuntu-latest
@@ -56,7 +54,7 @@ jobs:
       - name: Prepare - Setup Docker Buildx
         uses: docker/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
@@ -74,7 +72,7 @@ jobs:
         with:
           load: true
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to:
           tags: squidex-local
 
       - name: Start Compose
@@ -157,7 +155,7 @@ jobs:
       - name: Prepare - Setup Docker Buildx
         uses: docker/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
@@ -175,7 +173,7 @@ jobs:
         with:
           load: true
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to:
           tags: squidex-local
 
       - name: Start Compose

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,10 +21,8 @@ jobs:
         env:
           DOCKER_BUILD_RECORD_UPLOAD: false
         with:
-          load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: squidex-local
 
   test-containers:
     runs-on: ubuntu-latest
@@ -33,13 +31,13 @@ jobs:
       - name: Prepare - Checkout
         uses: actions/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
 
       - name: Test - TestContainers
-        run: dotnet test backend/Squidex.sln --filter Category==TestContainers
+        run: dotnet test backend/Squidex.sln --filter Category=TestContainers
 
   test-mongo:
     runs-on: ubuntu-latest
@@ -51,7 +49,7 @@ jobs:
       - name: Prepare - Setup Docker Buildx
         uses: docker/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
@@ -69,7 +67,7 @@ jobs:
         with:
           load: true
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to:
           tags: squidex-local
 
       - name: Start Compose
@@ -152,7 +150,7 @@ jobs:
       - name: Prepare - Setup Docker Buildx
         uses: docker/[email protected]
 
-      - name: Prepare - Setup DotNet
+      - name: Prepare - Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.0.x
@@ -170,7 +168,7 @@ jobs:
         with:
           load: true
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to:
           tags: squidex-local
 
       - name: Start Compose
@@ -253,8 +251,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
-          tags: squidex/squidex:${{ env.GITHUB_REF_SLUG }},squidex/squidex:${{ steps.version.outputs._0 }}${{env.STABLE_VERSION == 'true' && ',squidex/squidex:latest'}}
           push: true
+          tags: squidex/squidex:${{ env.GITHUB_REF_SLUG }},squidex/squidex:${{ steps.version.outputs._0 }}${{env.STABLE_VERSION == 'true' && ',squidex/squidex:latest'}}
 
       - name: Release - Make directories
         run: sudo mkdir /build /release
@@ -284,6 +282,7 @@ jobs:
           artifacts: "/release/binaries.zip"
           body: ${{ steps.changelog_reader.outputs.changes }}
           name: ${{ env.GITHUB_REF_SLUG }}
+          removeArtifacts: false
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/Dockerfile b/Dockerfile
@@ -9,10 +9,12 @@ RUN apt-get update \
  && apt-get install -y ffmpeg
 
 ARG SQUIDEX__BUILD__VERSION=7.0.0
+ARG SQUIDEX__BUILD__ARGS=
 
 WORKDIR /src
 
 # Copy nuget project files.
+COPY backend/Directory.Build.props ./
 COPY backend/*.sln ./
 
 # Copy the main source project files
@@ -32,16 +34,14 @@ RUN dotnet restore
 COPY backend .
 
 # Test Backend
-RUN dotnet test --no-restore --filter "Category!=Dependencies & Category!=TestContainer"
+RUN dotnet test --filter "Category!=Dependencies & Category!=TestContainer" --configuration Release
 
 # Publish
-RUN dotnet publish --no-restore src/Squidex/Squidex.csproj --output /build/ --configuration Release -p:version=$SQUIDEX__BUILD__VERSION
+RUN dotnet publish src/Squidex/Squidex.csproj --output /build/ --configuration Release -p:version=$SQUIDEX__BUILD__VERSION
 
 # Install tools
-RUN dotnet tool install --tool-path /tools dotnet-counters \
- && dotnet tool install --tool-path /tools dotnet-dump \
- && dotnet tool install --tool-path /tools dotnet-gcdump \
- && dotnet tool install --tool-path /tools dotnet-trace
+RUN dotnet tool install --tool-path /tools dotnet-dump \
+ && dotnet tool install --tool-path /tools dotnet-gcdump
 
 
 #
@@ -67,7 +67,6 @@ RUN npm run test:coverage \
 
 RUN cp -a build /build/
 
-
 #
 # Stage 3, Build runtime
 #
@@ -77,7 +76,9 @@ ARG SQUIDEX__RUNTIME__VERSION=7.0.0
 
 # Curl for debugging and libc-dev for protobuf
 RUN apt-get update \
- && apt-get install -y curl libc-dev ffmpeg
+ && apt-get install -y --no-install-recommends curl libc-dev
+
+COPY --from=mwader/static-ffmpeg:7.1.1 /ffprobe /usr/local/bin/
 
 # Default tool directory
 WORKDIR /tools
@@ -95,10 +96,8 @@ COPY --from=frontend /build/browser wwwroot/build/
 EXPOSE 80
 EXPOSE 443
 
-ENV DIAGNOSTICS__COUNTERSTOOL=/tools/dotnet-counters
 ENV DIAGNOSTICS__DUMPTOOL=/tools/dotnet-dump
 ENV DIAGNOSTICS__GCDUMPTOOL=/tools/dotnet-gcdump
-ENV DIAGNOSTICS__TRACETOOL=/tools/dotnet-trace
 ENV ASPNETCORE_HTTP_PORTS=80
 
 ENTRYPOINT ["dotnet", "Squidex.dll"]

diff --git a/backend/Directory.Build.props b/backend/Directory.Build.props
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DefineConstants>$(DefineConstants);INCLUDE_MAGICK;INCLUDE_KAFKA</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(DefineConstants.Contains(INCLUDE_MAGICK))'">
+	<IncludeMagick>true</IncludeMagick>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(DefineConstants.Contains(INCLUDE_KAFKA))'">
+	<IncludeKafka>true</IncludeKafka>
+  </PropertyGroup>
+</Project>
diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaAction.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaAction.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+#if INCLUDE_KAFKA
 using System.ComponentModel.DataAnnotations;
 using Squidex.Domain.Apps.Core.HandleRules;
 using Squidex.Domain.Apps.Core.Rules;
@@ -55,3 +56,4 @@ public sealed record KafkaAction : RuleAction
     [Editor(RuleFieldEditor.TextArea)]
     public string? Schema { get; set; }
 }
+#endif
diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaActionHandler.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+#if INCLUDE_KAFKA
 using Squidex.Domain.Apps.Core.HandleRules;
 using Squidex.Domain.Apps.Core.Rules.EnrichedEvents;
 
@@ -113,3 +114,4 @@ public sealed class KafkaJob
 
     public int PartitionCount { get; set; }
 }
+#endif
diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaPlugin.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaPlugin.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+#if INCLUDE_KAFKA
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -27,3 +28,4 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
         }
     }
 }
+#endif
diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+#if INCLUDE_KAFKA
 using System.Text;
 using Avro;
 using Avro.Generic;
@@ -278,3 +279,4 @@ private static bool IsTypeOrUnionWith(Schema? schema, Schema.Type expected)
         return schema?.Tag == expected || (schema is UnionSchema union && union.Schemas.Any(x => x.Tag == expected));
     }
 }
+#endif
diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducerOptions.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducerOptions.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+#if INCLUDE_KAFKA
 using Confluent.Kafka;
 using Confluent.SchemaRegistry;
 using Confluent.SchemaRegistry.Serdes;
@@ -27,3 +28,4 @@ public bool IsSchemaRegistryConfigured()
         return !string.IsNullOrWhiteSpace(SchemaRegistry?.Url);
     }
 }
+#endif
diff --git a/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
@@ -13,7 +13,6 @@
     <PackageReference Include="Algolia.Search" Version="6.17.0" />
     <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
     <PackageReference Include="Azure.Search.Documents" Version="11.6.0" />
-    <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.6.0" />
     <PackageReference Include="CoreTweet" Version="1.0.0.483" />
     <PackageReference Include="Elasticsearch.Net" Version="7.17.5" />
     <PackageReference Include="Google.Cloud.Diagnostics.Common" Version="5.2.0" />
@@ -41,6 +40,9 @@
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
+  <ItemGroup Condition="'$(IncludeKafka)' == 'true'">
+    <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="2.6.0" />
+  </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>

diff --git a/backend/src/Squidex.Data.EntityFramework/Squidex.Data.EntityFramework.csproj b/backend/src/Squidex.Data.EntityFramework/Squidex.Data.EntityFramework.csproj
@@ -35,13 +35,16 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="8.0.2" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="8.0.2" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.AI.EntityFramework" Version="6.35.0" />
-    <PackageReference Include="Squidex.Assets.EntityFramework" Version="6.35.0" />
-    <PackageReference Include="Squidex.Assets.TusAdapter" Version="6.35.0" />
-    <PackageReference Include="Squidex.EFCore.BulkExtensions" Version="8.1.6" />
-    <PackageReference Include="Squidex.Events.EntityFramework" Version="6.35.0" />
-    <PackageReference Include="Squidex.Hosting" Version="6.35.0" />
-    <PackageReference Include="Squidex.Messaging.EntityFramework" Version="6.35.0" />
+    <PackageReference Include="Squidex.AI.EntityFramework" Version="6.36.0" />
+    <PackageReference Include="Squidex.Assets.EntityFramework" Version="6.36.0" />
+    <PackageReference Include="Squidex.Assets.TusAdapter" Version="6.36.0" />
+    <PackageReference Include="Squidex.EFCore.BulkExtensions.Core" Version="8.1.6" />
+    <PackageReference Include="Squidex.EFCore.BulkExtensions.MySql" Version="8.1.6" />
+    <PackageReference Include="Squidex.EFCore.BulkExtensions.PostgreSQL" Version="8.1.6" />
+    <PackageReference Include="Squidex.EFCore.BulkExtensions.SqlServer" Version="8.1.6" />
+    <PackageReference Include="Squidex.Events.EntityFramework" Version="6.36.0" />
+    <PackageReference Include="Squidex.Hosting" Version="6.36.0" />
+    <PackageReference Include="Squidex.Messaging.EntityFramework" Version="6.36.0" />
     <PackageReference Include="Squidex.OpenIdDict.EntityFramework" Version="5.8.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj b/backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj
@@ -24,11 +24,11 @@
     <PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.5.0" />
     <PackageReference Include="MongoDB.Driver.GridFS" Version="2.30.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.AI.Mongo" Version="6.35.0" />
-    <PackageReference Include="Squidex.Assets.Mongo" Version="6.35.0" />
-    <PackageReference Include="Squidex.Events.Mongo" Version="6.35.0" />
-    <PackageReference Include="Squidex.Hosting" Version="6.35.0" />
-    <PackageReference Include="Squidex.Messaging.Mongo" Version="6.35.0" />
+    <PackageReference Include="Squidex.AI.Mongo" Version="6.36.0" />
+    <PackageReference Include="Squidex.Assets.Mongo" Version="6.36.0" />
+    <PackageReference Include="Squidex.Events.Mongo" Version="6.36.0" />
+    <PackageReference Include="Squidex.Hosting" Version="6.36.0" />
+    <PackageReference Include="Squidex.Messaging.Mongo" Version="6.36.0" />
     <PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
@@ -28,8 +28,8 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.AI" Version="6.35.0" />
-    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.35.0" />
+    <PackageReference Include="Squidex.AI" Version="6.36.0" />
+    <PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.36.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />

diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@@ -24,13 +24,13 @@
     <PackageReference Include="NodaTime" Version="3.2.0" />
     <PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
     <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="Squidex.Assets" Version="6.35.0" />
-    <PackageReference Include="Squidex.Caching" Version="6.35.0" />
-    <PackageReference Include="Squidex.Events" Version="6.35.0" />
-    <PackageReference Include="Squidex.Hosting.Abstractions" Version="6.35.0" />
-    <PackageReference Include="Squidex.Log" Version="6.35.0" />
-    <PackageReference Include="Squidex.Messaging" Version="6.35.0" />
-    <PackageReference Include="Squidex.Text" Version="6.35.0" />
+    <PackageReference Include="Squidex.Assets" Version="6.36.0" />
+    <PackageReference Include="Squidex.Caching" Version="6.36.0" />
+    <PackageReference Include="Squidex.Events" Version="6.36.0" />
+    <PackageReference Include="Squidex.Hosting.Abstractions" Version="6.36.0" />
+    <PackageReference Include="Squidex.Log" Version="6.36.0" />
+    <PackageReference Include="Squidex.Messaging" Version="6.36.0" />
+    <PackageReference Include="Squidex.Text" Version="6.36.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />