Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dockerfile changes to fix MongoEncryption:- libdl missing #509

Merged
merged 2 commits into from
Jan 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get clean \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
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



WORKDIR /opt/monai/ig

Expand All @@ -45,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
Expand Down
3 changes: 2 additions & 1 deletion doc/dependency_decisions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
:why: MIT (https://raw.githubusercontent.com/dotnet/runtime/main/LICENSE.TXT)
6 changes: 3 additions & 3 deletions src/Api/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/CLI/packages.lock.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/Client.Common/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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=="
}
}
}
Expand Down
Empty file modified src/Client/Test/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/Client/packages.lock.json
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions src/Common/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/Configuration/packages.lock.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Empty file modified src/Database/Api/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/Database/EntityFramework/Test/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/Database/MongoDB/Integration.Test/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/Database/packages.lock.json
100644 → 100755
Empty file.
6 changes: 3 additions & 3 deletions src/DicomWebClient/CLI/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/DicomWebClient/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Empty file modified src/InformaticsGateway/Test/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/InformaticsGateway/packages.lock.json
100644 → 100755
Empty file.
Empty file modified src/Plug-ins/RemoteAppExecution/Test/packages.lock.json
100644 → 100755
Empty file.
Empty file modified tests/Integration.Test/packages.lock.json
100644 → 100755
Empty file.
Loading