diff --git a/Dockerfile b/Dockerfile index 48c11e8..b29e308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,9 +41,5 @@ RUN pip install https://github.com/msbrogli/rpudb/archive/master.zip RUN pip install tzlocal COPY ./pfbridge /app -RUN apt update && \ - apt-get install -y apt-transport-https && \ - apt -y install vim telnet netcat procps - ENV PORT=33333 EXPOSE ${PORT} diff --git a/docker-compose.yml b/docker-compose.yml index 75488d1..567a341 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: PFLINK_USERNAME: pflink PFLINK_PASSWORD: pflink1234 NAME: PFDCMLOCAL - PACSNAME: PACSDCM + PACSNAME: orthanc CUBEANDSWIFTKEY: local ports: - "33333:33333" diff --git a/pfbridge/VERSION b/pfbridge/VERSION index 679e070..cdcb353 100644 --- a/pfbridge/VERSION +++ b/pfbridge/VERSION @@ -1,2 +1,2 @@ -3.7.1 +3.7.2 diff --git a/pfbridge/config/settings.py b/pfbridge/config/settings.py index 61f6130..b553355 100644 --- a/pfbridge/config/settings.py +++ b/pfbridge/config/settings.py @@ -65,6 +65,11 @@ def analysis_decode() -> None: 'passwordOrthanc': credentialsOrthanc.passwordOrthanc, 'urlOrthanc': serviceURLs.urlOrthanc } + }, + { + 'ignore': { + 'time': '%timestamp' + } } ] ) @@ -72,7 +77,6 @@ def analysis_decode() -> None: d_decode:dict = decode(analysis.__getattribute__(field)) analysisDecoded.__setattr__(field, d_decode["result"]) - pflink = Pflink() analysis = DylldAnalysis() analysisDecoded = DylldAnalysis()