diff --git a/docker-compose.yml b/docker-compose.yml
index 1c70aa88..dcdab38a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
context: client
dockerfile: Dockerfile
ports:
- - "8080:8080"
+ - "8080"
depends_on:
- wrattler_python_service
- wrattler_data_store
@@ -17,7 +17,7 @@ services:
context: server/python
dockerfile: Dockerfile
ports:
- - "7101:7101"
+ - "7101"
environment:
- FLASK_CONFIGURATION=default
- DATASTORE_URI=http://wrattler_wrattler_data_store_1:7102
@@ -29,7 +29,7 @@ services:
context: server/data-store
dockerfile: Dockerfile
ports:
- - "7102:7102"
+ - "7102"
networks:
- wrattler_nw
diff --git a/server/data-store/.paket/Paket.Restore.targets b/server/data-store/.paket/Paket.Restore.targets
index fb84d00c..6be03acb 100644
--- a/server/data-store/.paket/Paket.Restore.targets
+++ b/server/data-store/.paket/Paket.Restore.targets
@@ -18,6 +18,14 @@
$(PaketToolsPath)paket.exe
"$(PaketExePath)"
$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"
+
+
+ <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))
+ dotnet "$(PaketExePath)"
+
+
+ "$(PaketExePath)"
+
$(PaketRootPath)paket.bootstrapper.exe
$(PaketToolsPath)paket.bootstrapper.exe
"$(PaketBootStrapperExePath)"
@@ -30,27 +38,56 @@
true
-
+
true
- $(NoWarn);NU1603
+ $(NoWarn);NU1603;NU1604;NU1605;NU1608
+
+
+
+
+ /usr/bin/shasum "$(PaketRestoreCacheFile)" | /usr/bin/awk '{ print $1 }'
+ /usr/bin/shasum "$(PaketLockFilePath)" | /usr/bin/awk '{ print $1 }'
+
+
+
+
+
+
+
+
+
+
+
- $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))
- $([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))
+
+ $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))
+ $([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))
true
false
true
+
+ true
+
+
+
+
+
+
+
+
+
$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached
@@ -59,7 +96,9 @@
$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references
$(MSBuildProjectDirectory)\paket.references
- $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved
+
+ false
+ true
true
references-file-or-cache-not-found
@@ -78,30 +117,39 @@
-
+
true
- target-framework '$(TargetFramework)'
+ target-framework '$(TargetFramework)' or '$(TargetFrameworks)' files @(PaketResolvedFilePaths)
-
+
+
-
+
+ false
+ true
+
+
-
+
-
+
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])
$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])
+ $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])
%(PaketReferencesFileLinesInfo.PackageVersion)
+ All
+ runtime
+ true
@@ -123,9 +171,10 @@
+
@@ -136,15 +185,21 @@
+
+ <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
+
+
$(MSBuildProjectDirectory)/$(MSBuildProjectFile)
true
false
true
+ $(BaseIntermediateOutputPath)$(Configuration)
+ $(BaseIntermediateOutputPath)
- <_NuspecFiles Include="$(BaseIntermediateOutputPath)*.nuspec"/>
+ <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/>
@@ -153,6 +208,7 @@
+
async { return startServers() }
|> Async.Ignore
@@ -84,7 +84,8 @@ Target "start" (fun _ ->
System.Threading.Thread.Sleep(1000)
printfn "Waiting for servers to start...."
traceImportant "Servers started...."
- System.Diagnostics.Process.Start(sprintf "http://localhost:%d/" port) |> ignore
+ try System.Diagnostics.Process.Start(sprintf "http://localhost:%d/" port) |> ignore
+ with _ -> traceImportant "Failed to open web browser"
)
Target "run" (fun _ ->
@@ -92,6 +93,11 @@ Target "run" (fun _ ->
Console.ReadLine() |> ignore
)
+Target "sleep" (fun _ ->
+ System.Threading.Thread.Sleep(System.Threading.Timeout.Infinite);
+)
+
"start" ==> "run"
+"start" ==> "sleep"
RunTargetOrDefault "run"
diff --git a/server/data-store/src/config.fs.template b/server/data-store/src/config.fs.template
new file mode 100644
index 00000000..d71dabab
--- /dev/null
+++ b/server/data-store/src/config.fs.template
@@ -0,0 +1,2 @@
+module Config
+let WrattlerDataStore = "DefaultEndpointsProtocol=https;AccountName=(...);AccountKey=(...);EndpointSuffix=core.windows.net"
\ No newline at end of file