Bladeren bron

Delete unneded files, add entrypoint

Vadim Surkov 6 jaren geleden
bovenliggende
commit
8e9dd23284
8 gewijzigde bestanden met toevoegingen van 36 en 14 verwijderingen
  1. 2 3
      Dockerfile
  2. 0 0
      analis-default.conf
  3. 0 1
      citylab-createxml.bat
  4. 0 1
      citylab-exchange.bat
  5. 0 1
      citylab-results.bat
  6. 0 3
      citylab-rm.bat
  7. 34 0
      entrypoint.ps1
  8. 0 5
      image.bat

+ 2 - 3
Dockerfile

@@ -3,6 +3,5 @@ FROM microsoft/windowsservercore:10.0.14393.2724
 
 RUN reg add "HKCU\Control Panel\International" /F /V sShortDate /T REG_SZ /D dd.MM.yyyy
 RUN mkdir c:\Services\Analis
-COPY Infoclinica c:/Services/Analis
-COPY analis.conf c:/Services/Analis/analis-default.conf
-COPY infodent.ini c:/Services/Analis
+COPY Infoclinica analis-default.conf infodent.ini entrypoint.ps1 c:/Services/Analis/
+ENTRYPOINT ["powershell.exe","c:/Services/Analis/entrypoint.ps1"]

+ 0 - 0
analis.conf → analis-default.conf


+ 0 - 1
citylab-createxml.bat

@@ -1 +0,0 @@
-docker run -d -it --rm --name citylab-createxml --mount type=bind,source=c:\Services\Analis\Citylab,target=C:\Services\Analis\Citylab analis C:\\services\\Analis\\AnalisServer.exe CreateXMLInterval=15 LabSystems=990010000000005 LogPath=C:\Services\Analis\Citylab\CreateXML\Log

+ 0 - 1
citylab-exchange.bat

@@ -1 +0,0 @@
-docker run -d -it --rm --name citylab-exchange --mount type=bind,source=c:\Services\Analis\Citylab,target=C:\Services\Analis\Citylab analis C:\\services\\Analis\\AnalisServer.exe LabExchangeInterval=15 LoadPoolInterval=15 LabSystems=990010000000005 LogPath=C:\Services\Analis\Citylab\Exchange\Log

+ 0 - 1
citylab-results.bat

@@ -1 +0,0 @@
-docker run -d -it --rm --name citylab-results --mount type=bind,source=c:\Services\Analis\Citylab,target=C:\Services\Analis\Citylab analis C:\\services\\Analis\\AnalisServer.exe AnalisInterval=15 LabSystems=990010000000005 LogPath=C:\Services\Analis\Citylab\Results\Log

+ 0 - 3
citylab-rm.bat

@@ -1,3 +0,0 @@
-docker stop citylab-createxml
-docker stop citylab-exchange
-docker stop citylab-results

+ 34 - 0
entrypoint.ps1

@@ -0,0 +1,34 @@
+Set-PSDebug -Trace 1
+
+if (!$env:logshare) {
+    write-host "LogShare must be defined"
+    exit 1
+}
+if (!$env:filesshare) {
+    write-host "FilesShare must be defined"
+    exit 1
+}
+if (!$env:filespath) {
+    write-host "FilesPath must be defined"
+    exit 1
+}
+
+if ( test-path("C:\ProgramData\Docker\secrets\shares.username") -And test-path("C:\ProgramData\Docker\secrets\shares.passwd") ){
+    $sh_username=Get-Content -path "C:\ProgramData\Docker\secrets\shares.username"
+    $sh_passwd=Get-Content -path "C:\ProgramData\Docker\secrets\shares.passwd"
+    New-SmbMapping -RemotePath $env:logpath -UserName $sh_username -Password $sh_passwd
+    New-SmbMapping -RemotePath $env:filesshare -UserName $sh_username -Password $sh_passwd
+}
+else {
+    New-SmbMapping -RemotePath $env:logpath
+    New-SmbMapping -RemotePath $env:filesshare
+}
+
+new-item -ItemType SymbolicLink -path C:\Services\Analis -Name Log -value $env:logshare -Force
+new-item -ItemType SymbolicLink -path $env:filespath -Name Files -value $env:filesshare -Force
+
+if ( !test-path("C:\Services\Analis\analis.conf") ){
+    move-item -path C:\Services\Analis\analis-default.conf -destination C:\Services\Analis\analis.conf
+}
+
+C:\Services\Analis\AnalisServer.exe $args

+ 0 - 5
image.bat

@@ -1,5 +0,0 @@
-git.exe clone https://git.sdsys.ru/labportal/analis-service.git
-docker image rm analis
-svn.exe checkout svn://192.168.21.250/programs/trunk/Services/Analis/Win64 analis-service/Infoclinica --username public --password "sds#7753435"
-docker build -t analis analis-service\
-rmdir /S /Q analis-service