From 61f1424bd53541227889b00fca19bddb20dc73a3 Mon Sep 17 00:00:00 2001
From: imanabu <manabu@wingumd.com>
Date: Fri, 6 Aug 2021 17:27:56 -0700
Subject: [PATCH 1/2] * Docker container support

---
 .idea/workspace.xml | 73 +++++++++++++++++++++++++++++++--------------
 Dockerfile          | 17 +++++++++++
 README.md           | 16 ++++++++--
 docker-build.ps1    |  7 +++++
 4 files changed, 87 insertions(+), 26 deletions(-)
 create mode 100644 Dockerfile
 create mode 100644 docker-build.ps1

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1738de6..7bc221a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="697b07fc-c575-44f8-b9dd-f1e0b0b4999b" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docker-build.ps1" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/client/Main.js" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -32,10 +34,10 @@
   <component name="ProjectId" id="1Ymh0keiJbWNuwzyaFHT7WOqzVg" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -49,9 +51,21 @@
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RunManager" selected="JavaScript Debug.JS Debug">
-    <configuration name="JS Debug" type="JavascriptDebugType" engineId="98ca6316-2f89-46d9-a9e5-fa9e2b0625b3" uri="http://localhost:3000">
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="JS Debug" type="JavascriptDebugType" uri="http://localhost:3000">
       <mapping url="http://localhost:3000" local-file="$PROJECT_DIR$/client/Main.js" />
       <method v="2">
         <option name="NpmBeforeRunTask" enabled="true">
@@ -100,6 +114,7 @@
       <item itemvalue="npm.start" />
     </list>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="project-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="697b07fc-c575-44f8-b9dd-f1e0b0b4999b" name="Default Changelist" comment="" />
@@ -108,6 +123,7 @@
       <option name="presentableId" value="Default" />
       <updated>1583553455487</updated>
       <workItem from="1583553457727" duration="12648000" />
+      <workItem from="1628293356377" duration="2572000" />
     </task>
     <task id="LOCAL-00001" summary="Fix a lint issue.">
       <created>1583554006812</created>
@@ -148,40 +164,51 @@
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
     <option name="exactExcludedFiles">
       <list>
+        <option value="$PROJECT_DIR$/services/Names.js.map" />
         <option value="$PROJECT_DIR$/services/Names.js" />
+        <option value="$PROJECT_DIR$/services/mwlEntryGenerator.js.map" />
         <option value="$PROJECT_DIR$/services/mwlEntryGenerator.js" />
+        <option value="$PROJECT_DIR$/services/PersonGenerator.js.map" />
         <option value="$PROJECT_DIR$/services/PersonGenerator.js" />
+        <option value="$PROJECT_DIR$/services/Utils.js.map" />
         <option value="$PROJECT_DIR$/services/Utils.js" />
+        <option value="$PROJECT_DIR$/routes/api.js.map" />
+        <option value="$PROJECT_DIR$/routes/api.js" />
+        <option value="$PROJECT_DIR$/routes/index.js.map" />
         <option value="$PROJECT_DIR$/routes/index.js" />
+        <option value="$PROJECT_DIR$/client/AddComponent.js.map" />
+        <option value="$PROJECT_DIR$/client/AddComponent.js" />
+        <option value="$PROJECT_DIR$/client/Main.js.map" />
         <option value="$PROJECT_DIR$/client/Main.js" />
-        <option value="$PROJECT_DIR$/test/200-Mwl.spec.js" />
-        <option value="$PROJECT_DIR$/test/100.services.spec.js" />
-        <option value="$PROJECT_DIR$/interfaces.js" />
-        <option value="$PROJECT_DIR$/app.js" />
-        <option value="$PROJECT_DIR$/model/dtos.js" />
         <option value="$PROJECT_DIR$/model/dtos.js.map" />
-        <option value="$PROJECT_DIR$/app.js.map" />
-        <option value="$PROJECT_DIR$/interfaces.js.map" />
-        <option value="$PROJECT_DIR$/services/Names.js.map" />
-        <option value="$PROJECT_DIR$/services/PersonGenerator.js.map" />
-        <option value="$PROJECT_DIR$/services/mwlEntryGenerator.js.map" />
-        <option value="$PROJECT_DIR$/services/Utils.js.map" />
-        <option value="$PROJECT_DIR$/routes/api.js" />
-        <option value="$PROJECT_DIR$/routes/index.js.map" />
-        <option value="$PROJECT_DIR$/routes/api.js.map" />
-        <option value="$PROJECT_DIR$/test/300-API.spec.js" />
-        <option value="$PROJECT_DIR$/test/200-Mwl.spec.js.map" />
+        <option value="$PROJECT_DIR$/model/dtos.js" />
         <option value="$PROJECT_DIR$/test/100.services.spec.js.map" />
+        <option value="$PROJECT_DIR$/test/100.services.spec.js" />
+        <option value="$PROJECT_DIR$/test/200-Mwl.spec.js.map" />
+        <option value="$PROJECT_DIR$/test/200-Mwl.spec.js" />
         <option value="$PROJECT_DIR$/test/300-API.spec.js.map" />
-        <option value="$PROJECT_DIR$/client/Main.js.map" />
-        <option value="$PROJECT_DIR$/client/AddComponent.js" />
-        <option value="$PROJECT_DIR$/client/AddComponent.js.map" />
+        <option value="$PROJECT_DIR$/test/300-API.spec.js" />
+        <option value="$PROJECT_DIR$/interfaces.js.map" />
+        <option value="$PROJECT_DIR$/interfaces.js" />
+        <option value="$PROJECT_DIR$/app.js.map" />
+        <option value="$PROJECT_DIR$/app.js" />
       </list>
     </option>
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Fix a lint issue." />
     <MESSAGE value="Prepare for 0.0.8 release" />
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a5c172a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM node
+EXPOSE 3000
+ADD ./ /home/node/src
+RUN cp -r /home/node/src/bin /home/node/bin
+RUN cp -r /home/node/src/client /home/node/client
+RUN cp -r /home/node/src/config /home/node/config
+RUN cp -r /home/node/src/model /home/node/model
+RUN cp -r /home/node/src/public /home/node/public
+RUN cp -r /home/node/src/routes /home/node/routes
+RUN cp -r /home/node/src/services /home/node/services
+RUN cp -r /home/node/src/app.js /home/node/app.js
+RUN cp -r /home/node/src/routes /home/node/routes
+RUN cp -r /home/node/src/interfaces.* /home/node/.
+RUN cp -r /home/node/src/node_modules /home/node/node_modules
+RUN cp -r /home/node/src/package* /home/node/.
+RUN cp -r /home/node/src/tsconfig.json /home/node/.
+CMD cd /home/node && npm start
diff --git a/README.md b/README.md
index 3429004..d9ed445 100644
--- a/README.md
+++ b/README.md
@@ -8,13 +8,17 @@ Release Date: 2021-07-23
 
 ## New Features and Changes
 
+### 0.0.11
+
+Docker container support added
+
 ### 0.0.10
 * Fixed the limit parameter issue
 
 ### 0.0.9
 
 * Security Update
-* Compiler compatilibity updates for TypeScript 3.9.6
+* Compiler compatibility updates for TypeScript 3.9.6
 
 ### 0.0.8
 
@@ -64,8 +68,7 @@ No bugs
 
 ## Introduction
 
-When you are testing or a demo-ing a PACS or a modality, we often need to start from a Modality Worklist 
-and I always needed some ways of automatically generating them and I also want them to look somewhat
+When you are testing or a demo-ing a PACS or a modality, we often need to start from a Modality Worklist, and I always needed some ways of automatically generating them, and I also want them to look somewhat
 real and gender correct in terms of how the names are presented.
 
 So I wrote a Node/Express app to generate a bunch of visits with hospital departments
@@ -117,6 +120,13 @@ When the DICOM QIDO request is made for /studies it returns the MWL entries
 
 ## How To Install, Run and Improve It
 
+### If you want to just run this with the Docker...
+
+    docker pull voxeleron/dcm-mwl-testgen
+    docker run --rm -p 3000:3000 voxeleron/dcm-mwl-testgen
+
+### If you want to run directly on your machine or want to develop further...
+
 This is a NodeJS/Express project and written in TypeScript and so you would do the following.
 
 1. Install NodeJS and npm
diff --git a/docker-build.ps1 b/docker-build.ps1
new file mode 100644
index 0000000..8faef85
--- /dev/null
+++ b/docker-build.ps1
@@ -0,0 +1,7 @@
+$name="voxeleron/dcm-mwl-testgen"
+docker stop $name
+docker rm $name
+docker rmi $name
+# Build out the images
+docker build -t $name .
+docker tag $name $name:latest

From b887dcd72307b129b7af154a1330dd3f818cceb7 Mon Sep 17 00:00:00 2001
From: imanabu <manabu@wingumd.com>
Date: Fri, 6 Aug 2021 17:28:31 -0700
Subject: [PATCH 2/2] * Docker container support

---
 .idea/workspace.xml | 21 +++++++++++++--------
 package.json        |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7bc221a..d69b8dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="697b07fc-c575-44f8-b9dd-f1e0b0b4999b" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/docker-build.ps1" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+    <list default="true" id="697b07fc-c575-44f8-b9dd-f1e0b0b4999b" name="Default Changelist" comment="* Docker container support">
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -123,7 +120,7 @@
       <option name="presentableId" value="Default" />
       <updated>1583553455487</updated>
       <workItem from="1583553457727" duration="12648000" />
-      <workItem from="1628293356377" duration="2572000" />
+      <workItem from="1628293356377" duration="2720000" />
     </task>
     <task id="LOCAL-00001" summary="Fix a lint issue.">
       <created>1583554006812</created>
@@ -160,7 +157,14 @@
       <option name="project" value="LOCAL" />
       <updated>1583601515412</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="* Docker container support">
+      <created>1628296076537</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1628296076537</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -213,7 +217,8 @@
     <MESSAGE value="Fix a lint issue." />
     <MESSAGE value="Prepare for 0.0.8 release" />
     <MESSAGE value="Fix Raw display mode." />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix Raw display mode." />
+    <MESSAGE value="* Docker container support" />
+    <option name="LAST_COMMIT_MESSAGE" value="* Docker container support" />
   </component>
   <component name="WindowStateProjectService">
     <state x="439" y="190" key="#Web_Browsers" timestamp="1583594839615">
diff --git a/package.json b/package.json
index 89f065f..7a87773 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dcmwebmwltestgen",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "DICOM Web Based Modality Worklist Test Generator",
   "main": "app.js",
   "repository": "https://imanabu@github.com/imanabu/dcmWebMwlTestGen.git",