Vadim Surkov před 6 roky
rodič
revize
a911cca75e
3 změnil soubory, kde provedl 16 přidání a 7 odebrání
  1. 3 2
      Dockerfile
  2. 0 0
      analis.conf
  3. 13 5
      entrypoint.ps1

+ 3 - 2
Dockerfile

@@ -3,5 +3,6 @@ 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 analis-default.conf infodent.ini entrypoint.ps1 c:/Services/Analis/
-ENTRYPOINT ["powershell.exe","c:/Services/Analis/entrypoint.ps1"]
+COPY Infoclinica analis.conf infodent.ini entrypoint.ps1 c:/Services/Analis/
+#ENTRYPOINT ["powershell.exe","c:/Services/Analis/entrypoint.ps1"]
+ENTRYPOINT C:\\Services\\Analis\\AnalisServer.exe

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


+ 13 - 5
entrypoint.ps1

@@ -1,5 +1,9 @@
-Set-PSDebug -Trace 1
+#Set-PSDebug -Trace 1
 
+if (!$env:serviceshare) {
+    write-host "ServiceShare must be defined"
+    exit 1
+}
 if (!$env:logshare) {
     write-host "LogShare must be defined"
     exit 1
@@ -16,12 +20,10 @@ if (!$env:filespath) {
 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
+    New-SmbMapping -RemotePath $env:serviceshare -UserName $sh_username -Password $sh_passwd
 }
 else {
-    New-SmbMapping -RemotePath $env:logpath
-    New-SmbMapping -RemotePath $env:filesshare
+    New-SmbMapping -RemotePath $env:serviceshare
 }
 
 new-item -ItemType SymbolicLink -path C:\Services\Analis -Name Log -value $env:logshare -Force
@@ -31,6 +33,12 @@ if ( -Not (test-path("C:\Services\Analis\analis.conf")) ){
     move-item -path C:\Services\Analis\analis-default.conf -destination C:\Services\Analis\analis.conf
 }
 
+echo Get-SmbMapping
+Get-SmbMapping
+echo ls C:\Services\Analis\Log
+ls C:\Services\Analis\Log
+echo ls $env:filesshare
+ls $env:filesshare
 C:\Services\Analis\AnalisServer.exe $args
 
 sleep 1000000