diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0e2694d..ebc9448 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "csharpier": { - "version": "0.30.2", + "version": "0.30.3", "commands": ["dotnet-csharpier"] }, "dotnet-outdated-tool": { diff --git a/Dockerfile b/Dockerfile index 18dd99d..c12babb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV ASPNETCORE_ENVIRONMENT="Production" \ ASPNETCORE_URLS="http://*:9797" \ DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.100-noble@sha256:3bdd7f7fd595373d049c724f3a05ec8a8d9e27da05ba9cbe3ca6e0f3cc001e50 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.101-noble@sha256:991fd7c9c41fc12b47313bd2e1fb292c39e50fb50453ac11287b2877d3623d55 AS build WORKDIR "/build" ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/hack/compose.yaml b/hack/compose.yaml index 4ef3fce..356debf 100644 --- a/hack/compose.yaml +++ b/hack/compose.yaml @@ -14,7 +14,7 @@ services: - "127.0.0.1:8082:8080" keycloak: - image: quay.io/keycloak/keycloak:26.0.6@sha256:a93d22e13b8641c683b7d5ccf6802a8ee177a21357ab7950228c7517ad1896c0 + image: quay.io/keycloak/keycloak:26.0.7@sha256:4388e2379b7e870a447adbe7b80bd61f5fbf04e925832b19669fda4957f05a81 environment: KEYCLOAK_ADMIN: admin # kics-scan ignore-line diff --git a/hack/k8s/load-sample-data.yaml b/hack/k8s/load-sample-data.yaml index 62eb402..c3b7fb0 100644 --- a/hack/k8s/load-sample-data.yaml +++ b/hack/k8s/load-sample-data.yaml @@ -12,7 +12,7 @@ spec: type: RuntimeDefault initContainers: - name: wait-for-fhir-server - image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba + image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69 securityContext: allowPrivilegeEscalation: false runAsNonRoot: true @@ -37,7 +37,7 @@ spec: done; containers: - name: curl - image: curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba + image: curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69 securityContext: allowPrivilegeEscalation: false runAsNonRoot: true diff --git a/hack/k8s/pods.yaml b/hack/k8s/pods.yaml index 4f7f0f1..e659603 100644 --- a/hack/k8s/pods.yaml +++ b/hack/k8s/pods.yaml @@ -96,7 +96,7 @@ spec: type: RuntimeDefault initContainers: - name: wait-for-fhir-server - image: docker.io/curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba + image: docker.io/curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69 securityContext: allowPrivilegeEscalation: false runAsNonRoot: true diff --git a/hack/k8s/test-job.yaml b/hack/k8s/test-job.yaml index ce5ac54..cf08b00 100644 --- a/hack/k8s/test-job.yaml +++ b/hack/k8s/test-job.yaml @@ -11,7 +11,7 @@ spec: type: RuntimeDefault containers: - name: curl - image: curlimages/curl:8.11.0@sha256:83a505ba2ba62f208ed6e410c268b7b9aa48f0f7b403c8108b9773b44199dbba + image: curlimages/curl:8.11.1@sha256:c1fe1679c34d9784c1b0d1e5f62ac0a79fca01fb6377cdd33e90473c6f9f9a69 securityContext: allowPrivilegeEscalation: false runAsNonRoot: true diff --git a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj index c23f0db..d7d3598 100644 --- a/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj +++ b/src/FhirServerExporter.Tests.E2E/FhirServerExporter.Tests.E2E.csproj @@ -4,7 +4,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/FhirServerExporter.Tests.E2E/packages.lock.json b/src/FhirServerExporter.Tests.E2E/packages.lock.json index 734e90a..fd7ea8f 100644 --- a/src/FhirServerExporter.Tests.E2E/packages.lock.json +++ b/src/FhirServerExporter.Tests.E2E/packages.lock.json @@ -68,14 +68,14 @@ }, "Testcontainers": { "type": "Direct", - "requested": "[4.0.0, )", - "resolved": "4.0.0", - "contentHash": "wLG4Ls/A4jNB7b2ZrhtCUCHFBinDXohgvZ54fJB+kLVkxrqSuyQHdKwlIwPLgLSVGfPaMIAkZOEFVDSoEa1VxA==", + "requested": "[4.1.0, )", + "resolved": "4.1.0", + "contentHash": "5oudr81h9084amKZrjVIWdVWycR2YhqT9ePnN/ID7xinwx3ZLAI4EhYiyurfrDMvWcHJp5+c9x+qPRxOcq1IXQ==", "dependencies": { - "Docker.DotNet": "3.125.15", - "Docker.DotNet.X509": "3.125.15", - "Microsoft.Extensions.Logging.Abstractions": "6.0.4", - "SSH.NET": "2023.0.0", + "Docker.DotNet.Enhanced": "3.126.1", + "Docker.DotNet.Enhanced.X509": "3.126.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "SSH.NET": "2024.1.0", "SharpZipLib": "1.4.2" } }, @@ -104,22 +104,17 @@ "System.Diagnostics.EventLog": "6.0.0" } }, - "Docker.DotNet": { + "Docker.DotNet.Enhanced": { "type": "Transitive", - "resolved": "3.125.15", - "contentHash": "XN8FKxVv8Mjmwu104/Hl9lM61pLY675s70gzwSj8KR5pwblo8HfWLcCuinh9kYsqujBkMH4HVRCEcRuU6al4BQ==", - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "System.Buffers": "4.5.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } + "resolved": "3.126.1", + "contentHash": "UPyLBLBaVE3s7OCWM0h5g9w6mUOag5sOIP5CldFQekIWo/gHixgZR+o5fG7eCFH4ZdKlvBGM4ALFuOyPoKoJ3A==" }, - "Docker.DotNet.X509": { + "Docker.DotNet.Enhanced.X509": { "type": "Transitive", - "resolved": "3.125.15", - "contentHash": "ONQN7ImrL3tHStUUCCPHwrFFQVpIpE+7L6jaDAMwSF+yTEmeWBmRARQZDRuvfj/+WtB8RR0oTW0tT3qQMSyHOw==", + "resolved": "3.126.1", + "contentHash": "XFHMC/iWHbloQgg9apZrxu010DmSamaAggu8nomCqTeotGyUGkv2Tt/aqk1ljC/4tjtTrb9LtFQwYpwZbMbiKg==", "dependencies": { - "Docker.DotNet": "3.125.15" + "Docker.DotNet.Enhanced": "3.126.1" } }, "Fhir.Metrics": { @@ -151,10 +146,18 @@ "resolved": "17.12.0", "contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA==" }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.4", - "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw==" + "resolved": "8.0.2", + "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", @@ -190,27 +193,14 @@ }, "SSH.NET": { "type": "Transitive", - "resolved": "2023.0.0", - "contentHash": "g+3VDUrYhm0sqSxmlQFgRFrmBxhQvVh4pfn4pqjkX7WXE3tTjt1tIsOtjuz3mz/5s8gFFQVRydwCJ7Ohs54sJA==", - "dependencies": { - "SshNet.Security.Cryptography": "[1.3.0]" - } - }, - "SshNet.Security.Cryptography": { - "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "5pBIXRjcSO/amY8WztpmNOhaaCNHY/B6CcYDI7FSTgqSyo/ZUojlLiKcsl+YGbxQuLX439qIkMfP0PHqxqJi/Q==" + "resolved": "2024.1.0", + "contentHash": "pyOea9czgC+OwMoetuWtMuwRebOyskKkqTZtODgyEZ5K6JwV+Hh/GFiyYubl93YnEvmvNZeuyWyUDsb3LvBDYA==" }, "StyleCop.Analyzers.Unstable": { "type": "Transitive", "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "5.0.0", @@ -267,11 +257,6 @@ "System.Windows.Extensions": "6.0.0" } }, - "System.Threading.Tasks.Extensions": { - "type": "Transitive", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" - }, "System.Windows.Extensions": { "type": "Transitive", "resolved": "6.0.0",