diff --git a/CTP.conf b/CTP.conf index 1c01bbb..dfb47ec 100644 --- a/CTP.conf +++ b/CTP.conf @@ -10,5 +10,5 @@ expect fork script cd $CTP_HOME -java -jar ./CTP-runner.jar +java -jar ./Runner.jar end script diff --git a/DicomServiceAnonymizer.script b/DicomServiceAnonymizer.script new file mode 100644 index 0000000..58d5e8e --- /dev/null +++ b/DicomServiceAnonymizer.script @@ -0,0 +1,1044 @@ + diff --git a/Dockerfile b/Dockerfile index 552ca8e..125404f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN apt-get update && apt-get -y install git \ unzip RUN mkdir /JavaPrograms +RUN mkdir /JavaPrograms/scripts RUN mkdir /code WORKDIR /code ADD . /code @@ -27,9 +28,11 @@ RUN cp /code/ctpService-ubuntu.sh /code/CTP/linux/ctpService-ubuntu.sh # Add our custom configuration files RUN cp /code/config.xml /JavaPrograms/config.xml +RUN cp /code/DicomServiceAnonymizer.script /JavaPrograms/scripts/DicomServiceAnonymizer.script #RUN wget http://mirc.rsna.org/ImageIO/linux-x86_64.zip #RUN unzip linux-x86_64.zip #RUN mv linux-x86_64/* /JavaPrograms EXPOSE 1080 +EXPOSE 104 CMD /bin/bash /code/start.sh diff --git a/config.xml b/config.xml index fd5c1d1..70d77aa 100644 --- a/config.xml +++ b/config.xml @@ -6,31 +6,21 @@ + quarantine="quarantines/DirectoryImportService"/> - + script="scripts/DicomServiceAnonymizer.script"/>