From a7da1478a301095bd7cf371692521ac828e81321 Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 17 Jan 2024 15:04:43 +0000 Subject: [PATCH 1/2] dockerfile changes to fix MongoEncryption:- libdl missing Signed-off-by: Neil South --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index f5ecd080..63e83fdd 100755 --- a/Dockerfile +++ b/Dockerfile @@ -35,9 +35,12 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get clean \ && apt-get update \ && apt-get install -y --no-install-recommends \ + && apt install -y libc-dev \ # this is a workaround for Mongo encryption library curl \ && rm -rf /var/lib/apt/lists +RUN ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /app/libdl.so # part 2 of workaround for Mongo encryption library + WORKDIR /opt/monai/ig COPY --from=build /app/out . From 2d19bc6860f06c9c2dc165b91e0690f0af249b72 Mon Sep 17 00:00:00 2001 From: Neil South Date: Wed, 17 Jan 2024 15:32:29 +0000 Subject: [PATCH 2/2] fixup for missing licence Signed-off-by: Neil South --- Dockerfile | 11 ++++++----- doc/dependency_decisions.yml | 3 ++- src/Api/packages.lock.json | 6 +++--- src/CLI/packages.lock.json | 6 +++--- src/Client.Common/packages.lock.json | 6 +++--- src/Client/Test/packages.lock.json | 0 src/Client/packages.lock.json | 0 src/Common/packages.lock.json | 6 +++--- src/Configuration/packages.lock.json | 6 +++--- src/Database/Api/packages.lock.json | 0 src/Database/EntityFramework/Test/packages.lock.json | 0 .../MongoDB/Integration.Test/packages.lock.json | 0 src/Database/packages.lock.json | 0 src/DicomWebClient/CLI/packages.lock.json | 6 +++--- src/DicomWebClient/packages.lock.json | 6 +++--- src/InformaticsGateway/Test/packages.lock.json | 0 src/InformaticsGateway/packages.lock.json | 0 .../RemoteAppExecution/Test/packages.lock.json | 0 tests/Integration.Test/packages.lock.json | 0 19 files changed, 29 insertions(+), 27 deletions(-) mode change 100644 => 100755 src/CLI/packages.lock.json mode change 100644 => 100755 src/Client/Test/packages.lock.json mode change 100644 => 100755 src/Client/packages.lock.json mode change 100644 => 100755 src/Configuration/packages.lock.json mode change 100644 => 100755 src/Database/Api/packages.lock.json mode change 100644 => 100755 src/Database/EntityFramework/Test/packages.lock.json mode change 100644 => 100755 src/Database/MongoDB/Integration.Test/packages.lock.json mode change 100644 => 100755 src/Database/packages.lock.json mode change 100644 => 100755 src/InformaticsGateway/Test/packages.lock.json mode change 100644 => 100755 src/InformaticsGateway/packages.lock.json mode change 100644 => 100755 src/Plug-ins/RemoteAppExecution/Test/packages.lock.json mode change 100644 => 100755 tests/Integration.Test/packages.lock.json diff --git a/Dockerfile b/Dockerfile index 63e83fdd..a45cf800 100755 --- a/Dockerfile +++ b/Dockerfile @@ -34,12 +34,11 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get clean \ && apt-get update \ - && apt-get install -y --no-install-recommends \ - && apt install -y libc-dev \ # this is a workaround for Mongo encryption library - curl \ - && rm -rf /var/lib/apt/lists + && apt-get install -y --no-install-recommends curl \ + && apt-get install -y libc-dev # this is a workaround for Mongo encryption library +RUN rm -rf /var/lib/apt/lists + -RUN ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /app/libdl.so # part 2 of workaround for Mongo encryption library WORKDIR /opt/monai/ig @@ -48,6 +47,8 @@ COPY --from=build /tools /opt/dotnetcore-tools COPY LICENSE ./ COPY docs/compliance/third-party-licenses.md ./ +RUN ln -s /usr/lib/x86_64-linux-gnu/libdl.so.2 /opt/monai/ig/libdl.so # part 2 of workaround for Mongo encryption library + EXPOSE 104 EXPOSE 2575 EXPOSE 5000 diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml index 1f67b94a..a5df96c6 100755 --- a/doc/dependency_decisions.yml +++ b/doc/dependency_decisions.yml @@ -583,6 +583,7 @@ - Microsoft.NET.ILLink.Tasks - :versions: - 8.0.0 + - 8.0.1 :when: 2022-10-14T23:37:16.793Z :who: mocsharp :why: MIT (https://github.com/dotnet/runtime/raw/main/LICENSE.TXT) @@ -1775,4 +1776,4 @@ - 7.0.0 :when: 2023-08-10T20:50:14.759Z :who: mocsharp - :why: MIT (https://raw.githubusercontent.com/dotnet/runtime/main/LICENSE.TXT) \ No newline at end of file + :why: MIT (https://raw.githubusercontent.com/dotnet/runtime/main/LICENSE.TXT) diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json index 6fe9b721..9157d20a 100755 --- a/src/Api/packages.lock.json +++ b/src/Api/packages.lock.json @@ -41,9 +41,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Monai.Deploy.Messaging": { "type": "Direct", diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json old mode 100644 new mode 100755 index bc6481d7..99b5fa94 --- a/src/CLI/packages.lock.json +++ b/src/CLI/packages.lock.json @@ -35,9 +35,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "System.CommandLine.Hosting": { "type": "Direct", diff --git a/src/Client.Common/packages.lock.json b/src/Client.Common/packages.lock.json index e066f866..522b2481 100755 --- a/src/Client.Common/packages.lock.json +++ b/src/Client.Common/packages.lock.json @@ -10,9 +10,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" } } } diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json index 3c355129..ae98eff9 100755 --- a/src/Common/packages.lock.json +++ b/src/Common/packages.lock.json @@ -10,9 +10,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "System.IO.Abstractions": { "type": "Direct", diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json old mode 100644 new mode 100755 index 9aef01cb..0fd6efb8 --- a/src/Configuration/packages.lock.json +++ b/src/Configuration/packages.lock.json @@ -4,9 +4,9 @@ "net8.0": { "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/Database/Api/packages.lock.json b/src/Database/Api/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Database/EntityFramework/Test/packages.lock.json b/src/Database/EntityFramework/Test/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/DicomWebClient/CLI/packages.lock.json b/src/DicomWebClient/CLI/packages.lock.json index 052d8cd8..43be542c 100755 --- a/src/DicomWebClient/CLI/packages.lock.json +++ b/src/DicomWebClient/CLI/packages.lock.json @@ -14,9 +14,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json index 47c71c84..1aa43eba 100755 --- a/src/DicomWebClient/packages.lock.json +++ b/src/DicomWebClient/packages.lock.json @@ -23,9 +23,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "B3etT5XQ2nlWkZGO2m/ytDYrOmSsQG1XNBaM6ZYlX5Ch/tDrMFadr0/mK6gjZwaQc55g+5+WZMw4Cz3m8VEF7g==" + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "ADdJXuKNjwZDfBmybMnpvwd5CK3gp92WkWqqeQhW4W+q4MO3Qaa9QyW2DcFLAvCDMcCWxT5hRXqGdv13oon7nA==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json old mode 100644 new mode 100755 diff --git a/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json b/src/Plug-ins/RemoteAppExecution/Test/packages.lock.json old mode 100644 new mode 100755 diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json old mode 100644 new mode 100755