optimize dockerfile (#156)

Author: mlapaglia

.dockerignore

@@ -31,4 +31,8 @@ coverage/
 **/*.tmp
 **/.nyc_output
 **/coverage/
-**/e2e/
+**/e2e/
+**/[Bb]in/
+**/[Oo]bj/
+**/[Rr]elease/
+**/OpenAlprWebhookProcessor.Server/config

OpenAlprWebhookProcessor.Server/CameraUpdateService/ISimpleCameraScheduler.cs

@@ -23,7 +23,7 @@ public interface ISimpleCameraScheduler
 
         List<ScheduledJobInfo> GetAllScheduledJobs();
 
-        Task ScheduleOverlayAsync(CameraUpdateRequest cameraUpdateRequest, CancellationToken cancellationToken = default);
+        Task ScheduleOverlayAsync(CameraUpdateRequest cameraUpdaterequest, CancellationToken cancellationToken);
 
         Task ClearOverlayAsync(Guid cameraId, CancellationToken cancellationToken = default);
 

OpenAlprWebhookProcessor.Server/CameraUpdateService/SimpleCameraScheduler.cs

@@ -54,22 +54,28 @@ public async Task StopAsync(CancellationToken cancellationToken = default)
 
             foreach (var kvp in _cancellationTokens)
             {
-                kvp.Value.Cancel();
+                await kvp.Value.CancelAsync();
             }
 
             foreach (var kvp in _overlayCancellationTokens)
             {
-                kvp.Value.Cancel();
+                await kvp.Value.CancelAsync();
             }
 
             foreach (var kvp in _cameraTimers)
             {
-                kvp.Value?.Dispose();
+                if (kvp.Value != null)
+                {
+                    await kvp.Value.DisposeAsync();
+                }
             }
 
             foreach (var kvp in _overlayTimers)
             {
-                kvp.Value?.Dispose();
+                if (kvp.Value != null)
+                {
+                    await kvp.Value.DisposeAsync();
+                }
             }
 
             _cameraTimers.Clear();
@@ -234,7 +240,7 @@ private void ScheduleCameraTimer(
 
                 try
                 {
-                    _nextExecutionTimes.TryRemove(cameraId, out var whatever);
+                    _nextExecutionTimes.TryRemove(cameraId, out var _);
                     await ExecuteCameraToggleAsync(cameraId, cancellationTokenSource.Token);
                     await RescheduleCameraAsync(cameraId, cancellationTokenSource.Token);
                 }
@@ -773,6 +779,8 @@ public void Dispose()
             _overlayExecutionTimes.Clear();
 
             _disposed = true;
+
+            GC.SuppressFinalize(this);
         }
     }
 }

OpenAlprWebhookProcessor.Server/CameraUpdateService/SimpleCameraSchedulerHostedService.cs

@@ -28,9 +28,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
                 await Task.Delay(Timeout.Infinite, stoppingToken);
             }
-            catch (OperationCanceledException)
+            catch (OperationCanceledException ex)
             {
-                _logger.LogInformation("SimpleCameraScheduler hosted service stopping");
+                _logger.LogInformation(ex, "SimpleCameraScheduler hosted service stopping");
             }
             catch (Exception ex)
             {

OpenAlprWebhookProcessor.Server/Data/ProcessorContext.cs

@@ -12,11 +12,6 @@ public ProcessorContext(DbContextOptions<ProcessorContext> options)
         {
         }
 
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            base.OnConfiguring(optionsBuilder);
-        }
-
         public override async Task<int> SaveChangesAsync(CancellationToken cancellationToken = default)
         {
             await EnsureWalModeAsync(cancellationToken);

OpenAlprWebhookProcessor.Server/Dockerfile

@@ -28,15 +28,13 @@ ARG GIT_ASSEMBLY_VERSION
 ARG GIT_FILE_VERSION
 WORKDIR /src
 
-# Copy configuration files
 COPY ["openalprwebhookprocessor.client/angular.json", \
       "openalprwebhookprocessor.client/tsconfig*.json", \
       "openalprwebhookprocessor.client/karma.conf.js", \
       "openalprwebhookprocessor.client/eslint.config.mjs", \
       "openalprwebhookprocessor.client/ngsw-config.json", \
       "openalprwebhookprocessor.client/"]
 
-# Copy source code (changes most frequently)
 COPY ["OpenAlprWebhookProcessor.Server/", "OpenAlprWebhookProcessor.Server/"]
 COPY ["openalprwebhookprocessor.client/src/", "openalprwebhookprocessor.client/src/"]
 
@@ -47,22 +45,18 @@ RUN dotnet build "./OpenAlprWebhookProcessor.Server.csproj" -c $BUILD_CONFIGURAT
     -p:GitAssemblyVersion="$GIT_ASSEMBLY_VERSION" \
     -p:GitFileVersion="$GIT_FILE_VERSION" && \
     mkdir -p /app/build && \
-    /root/.dotnet/tools/dotnet-ef migrations bundle \
+    /root/.dotnet/tools/dotnet-ef migrations script \
         --project "./OpenAlprWebhookProcessor.Server.csproj" \
         --startup-project "./OpenAlprWebhookProcessor.Server.csproj" \
         --context ProcessorContext \
-        --output /app/build/processor-migrator \
-        --configuration $BUILD_CONFIGURATION \
-        --verbose \
-        --force && \
-    /root/.dotnet/tools/dotnet-ef migrations bundle \
+        --output /app/build/processor-migrations.sql \
+        --configuration $BUILD_CONFIGURATION && \
+    /root/.dotnet/tools/dotnet-ef migrations script \
         --project "./OpenAlprWebhookProcessor.Server.csproj" \
         --startup-project "./OpenAlprWebhookProcessor.Server.csproj" \
         --context UsersContext \
-        --output /app/build/users-migrator \
-        --configuration $BUILD_CONFIGURATION \
-        --verbose \
-        --force
+        --output /app/build/users-migrations.sql \
+        --configuration $BUILD_CONFIGURATION
 
 FROM build AS publish
 ARG BUILD_CONFIGURATION
@@ -72,6 +66,7 @@ ARG GIT_FILE_VERSION
 RUN dotnet publish "./OpenAlprWebhookProcessor.Server.csproj" \
     -c $BUILD_CONFIGURATION \
     -o /app/publish \
+    -r linux-musl-x64 \
     /p:UseAppHost=false \
     /p:PublishSingleFile=false \
     -p:GitVersion="$GIT_VERSION" \
@@ -81,9 +76,12 @@ RUN dotnet publish "./OpenAlprWebhookProcessor.Server.csproj" \
 FROM base AS final
 WORKDIR /app
 
+USER root
+RUN apk add --no-cache sqlite
+
 COPY --from=publish /app/publish .
-COPY --from=build /app/build/processor-migrator ./processor-migrator
-COPY --from=build /app/build/users-migrator ./users-migrator
+COPY --from=build /app/build/processor-migrations.sql ./processor-migrations.sql
+COPY --from=build /app/build/users-migrations.sql ./users-migrations.sql
 COPY --from=build /src/OpenAlprWebhookProcessor.Server/scripts/entrypoint.sh ./
 
 USER root

OpenAlprWebhookProcessor.Server/Features/Alerts/AlertService.cs

@@ -8,15 +8,15 @@ namespace OpenAlprWebhookProcessor.Features.Alerts
 {
     public class AlertService : IAlertService, IDisposable
     {
-        private readonly Channel<AlertUpdateRequest> _alertsChannel;
         private readonly ChannelWriter<AlertUpdateRequest> _writer;
+
         private readonly ChannelReader<AlertUpdateRequest> _reader;
 
         private bool _disposed = false;
 
         public AlertService()
         {
-            _alertsChannel = Channel.CreateUnbounded<AlertUpdateRequest>();
+            var _alertsChannel = Channel.CreateUnbounded<AlertUpdateRequest>();
             _writer = _alertsChannel.Writer;
             _reader = _alertsChannel.Reader;
         }
@@ -54,6 +54,8 @@ public void Dispose()
 
             CompleteChannel();
             _disposed = true;
+
+            GC.SuppressFinalize(this);
         }
     }
 }

OpenAlprWebhookProcessor.Server/Features/Alerts/Commands/AddAlert/AddAlertCommandHandler.cs

@@ -16,7 +16,7 @@ public AddAlertCommandHandler(IUnitOfWork unitOfWork)
             _unitOfWork = unitOfWork;
         }
 
-        public async ValueTask<Unit> Handle(AddAlertCommand command, CancellationToken cancellationToken = default)
+        public async ValueTask<Unit> Handle(AddAlertCommand command, CancellationToken cancellationToken)
         {
             var existingAlerts = await _unitOfWork.Alerts.FindAsync(
                 x => x.PlateNumber == command.Alert.PlateNumber.ToUpper(),

OpenAlprWebhookProcessor.Server/Features/Alerts/Commands/DeleteAlert/DeleteAlertCommandHandler.cs

@@ -15,7 +15,7 @@ public DeleteAlertCommandHandler(IUnitOfWork unitOfWork)
             _unitOfWork = unitOfWork;
         }
 
-        public async ValueTask<Unit> Handle(DeleteAlertCommand command, CancellationToken cancellationToken = default)
+        public async ValueTask<Unit> Handle(DeleteAlertCommand command, CancellationToken cancellationToken)
         {
             var alert = await _unitOfWork.Alerts.GetByIdAsync(command.Id, cancellationToken);
 

OpenAlprWebhookProcessor.Server/Features/Alerts/Commands/TestPushover/TestPushoverCommandHandler.cs

@@ -21,7 +21,7 @@ public TestPushoverCommandHandler(
             _alertClient = alertClients.First(x => x is PushoverClient);
         }
 
-        public async ValueTask<Unit> Handle(TestPushoverCommand command, CancellationToken cancellationToken = default)
+        public async ValueTask<Unit> Handle(TestPushoverCommand command, CancellationToken cancellationToken)
         {
             var testPlateGroup = await _unitOfWork.PlateGroups.GetQueryable()
                 .Include(x => x.PlateImage)