Api and Management support minio

.vscode/launch.json

@@ -25,13 +25,17 @@
                 }
             },
             "env": {
-                "PUBLIC_KEY_PATH": "../../../deployments/dev/ssh/tweekgit_public.pfx",
-                "Rules__Management__Url": "http://localhost:4002",
                 "ASPNETCORE_ENVIRONMENT": "Development",
-                "Addons__Redis__className": "Tweek.Drivers.Redis.RedisServiceAddon",
+                "PUBLIC_KEY_PATH": "../../../deployments/dev/ssh/tweekgit_public.pfx",
                 "Addons__Redis__assemblyName": "Tweek.Drivers.Redis",
+                "Addons__Redis__className": "Tweek.Drivers.Redis.RedisServiceAddon",
                 "ContextProvider": "redis",
-                "Redis__ConnectionString": "127.0.0.1:4006"
+                "Redis__ConnectionString": "127.0.0.1:4006",
+                "Addons__Minio__className": "Tweek.Drivers.Rules.Minio.RulesMinioAddon",
+                "Addons__Minio__assemblyName": "Tweek.Drivers.Rules.Minio",
+                "Rules__Minio__Endpoint": "localhost:4007",
+                "Rules__Minio__AccessKeyPath": "../../../deployments/dev/minio/access_key",
+                "Rules__Minio__SecretKeyPath": "../../../deployments/dev/minio/secret_key"
             },
             "sourceFileMap": {
                 "/Views": "${workspaceRoot}/Views"

CI/codefresh.yml

@@ -23,7 +23,6 @@ steps:
     title: Building Tweek Api Docker Image
     type: build
     image_name: soluto/tweek-api
-    working_directory: ${{main_clone}}
     dockerfile: TweekApiDockerfile
 
   BuildingManagement:
@@ -59,7 +58,7 @@ steps:
   Tests:
     title: Tests - e2e & smoke
     type: composition
-    composition: tweek_test_composition
+    composition: ./CI/test-composition.yml
     composition_variables:
       - KEYS_IMAGE=${{BuildGitKeys}}
       - REPOSITORY_IMAGE=${{BuildingGitRepository}}
@@ -87,6 +86,7 @@ steps:
           - editor
           - authoring
           - api
+          - management
         environment:
           - EDITOR_URL=http://editor:3000/
           - TWEEK_API_URL=http://api/
@@ -100,6 +100,7 @@ steps:
         depends_on:
           - authoring
           - api
+          - management
         environment:
           - API_URL=http://api
           - AUTHORING_URL=http://authoring:3000

CI/test-composition.yml

@@ -0,0 +1,109 @@
+version: '2'
+services:
+  keys:
+    image: $KEYS_IMAGE
+
+  git:
+    image: $REPOSITORY_IMAGE
+    volumes_from:
+      - keys
+    environment:
+      - PUBLIC_KEY_PATH=/gitkeys/tweekgit.pub
+      - TWEEK_MANAGEMENT_URL=http://management:3000
+
+  management:
+    image: $MANAGEMENT_IMAGE
+    depends_on:
+      - api
+      - git
+      - minio
+    volumes_from:
+      - keys
+    logging:
+      driver: "none"
+    environment:
+      - VALIDATION_URL=http://api/validation
+      - GIT_USER=git
+      - GIT_URL=ssh://git@git/tweek/tests
+      - GIT_PRIVATE_KEY_PATH=/gitkeys/tweekgit
+      - GIT_PUBLIC_KEY_PATH=/gitkeys/tweekgit.pub
+      - MINIO_ENDPOINT=minio:9000
+      - MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
+      - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+
+  api:
+    image: $API_IMAGE
+    depends_on:
+      - minio
+      - redis
+    volumes_from:
+      - keys
+    logging:
+      driver: "none"
+    environment:
+      - Rules__Minio__Endpoint=minio:9000
+      - Rules__Minio__AccessKey=AKIAIOSFODNN7EXAMPLE
+      - Rules__Minio__SecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+      - Rules__Minio__SampleIntervalInMs=500
+      - Addons__Minio__className=Tweek.Drivers.Rules.Minio.RulesMinioAddon
+      - Addons__Minio__assemblyName=Tweek.Drivers.Rules.Minio
+      - PUBLIC_KEY_PATH=/gitkeys/tweekgit_public.pfx
+      - ContextProvider=redis
+      - Redis__ConnectionString=redis:6379
+      - Addons__Redis__ClassName=Tweek.Drivers.Redis.RedisServiceAddon
+      - Addons__Redis__AssemblyName=Tweek.Drivers.Redis
+      - CorsPolicies__Keys__Origins=http://editor:3000,http://testorigin
+      - CorsPolicies__Keys__Methods=GET
+      - CorsPolicies__Keys__MaxPreflightAge=60
+      - CorsEnabled=true
+      - CorsPolicies__Keys__Headers=
+      - CorsPolicies__Keys__ExposedHeaders=
+
+  authoring:
+    image: $AUTHORING_IMAGE
+    depends_on:
+      - git
+    volumes_from:
+      - keys
+    logging:
+      driver: "none"
+    environment:
+      - GIT_USER=git
+      - GIT_URL=ssh://git@git/tweek/tests
+      - GIT_PRIVATE_KEY_PATH=/gitkeys/tweekgit
+      - GIT_PUBLIC_KEY_PATH=/gitkeys/tweekgit.pub
+
+  editor:
+    image: $EDITOR_IMAGE
+    depends_on:
+      - api
+      - authoring
+    volumes_from:
+      - keys
+    logging:
+      driver: "none"
+    environment:
+      - GIT_PRIVATE_KEY_PATH=/gitkeys/tweekgit
+      - TWEEK_API_HOSTNAME=http://api
+      - AUTHORING_API_HOSTNAME=http://authoring:3000
+
+  redis:
+    image: redis:4.0.2-alpine
+    expose:
+      - "6379"
+    logging:
+      driver: "none"
+
+  minio:
+    image: minio/minio
+    logging:
+      driver: "none"
+    command: server /data
+    environment:
+      - MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
+      - MINIO_SECRET_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+
+  selenium:
+    image: selenium/standalone-chrome:3.4.0
+    logging:
+      driver: "none"

Tweek.sln

@@ -43,10 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Engine.UnitTests", "core\En
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Rules.Management", "addons\Rules\Tweek.Drivers.Rules.Management\Tweek.Drivers.Rules.Management.csproj", "{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Blob", "addons\Rules\Tweek.Drivers.Blob\Tweek.Drivers.Blob.csproj", "{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Blob.Tests", "addons\Rules\Tweek.Drivers.Blob.Tests\Tweek.Drivers.Blob.Tests.csproj", "{7127F881-3A87-48F6-A04F-9EA5B74096F4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Context", "Context", "{BD1E6B57-18E1-46E9-B16F-B531E88FB9E3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Redis", "addons\Context\Tweek.Drivers.Redis\Tweek.Drivers.Redis.csproj", "{70ACAF9B-A91A-46CB-A7EF-F4D2A0736510}"
@@ -63,7 +59,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Couchbase", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Couchbase.ContextIntegrationTests", "addons\Context\Tweek.Drivers.Couchbase.ContextIntegrationTests\Tweek.Drivers.Couchbase.ContextIntegrationTests.csproj", "{B42A9284-DFA0-4C36-A683-DE0DAB05C3EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Rules.Management.Tests", "addons\Tweek.Drivers.Rules.Management.Tests\Tweek.Drivers.Rules.Management.Tests.csproj", "{D193121C-49C8-47C6-A366-735D9B014E81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Rules.Management.Tests", "addons\Rules\Tweek.Drivers.Rules.Management.Tests\Tweek.Drivers.Rules.Management.Tests.csproj", "{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rules", "Rules", "{EC243F60-6EE3-4022-B254-F8F7BB40AAA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tweek.Drivers.Rules.Minio", "addons\Rules\Tweek.Drivers.Rules.Minio\Tweek.Drivers.Rules.Minio.csproj", "{5374D25F-84B6-4ACA-B92E-21902410BE84}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tweek.Drivers.Rules.Minio.Tests", "addons\Rules\Tweek.Drivers.Rules.Minio.Tests\Tweek.Drivers.Rules.Minio.Tests.csproj", "{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -191,30 +193,6 @@ Global
 		{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69}.Release|x64.Build.0 = Release|Any CPU
 		{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69}.Release|x86.ActiveCfg = Release|Any CPU
 		{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69}.Release|x86.Build.0 = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|x64.Build.0 = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Debug|x86.Build.0 = Debug|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|x64.ActiveCfg = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|x64.Build.0 = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|x86.ActiveCfg = Release|Any CPU
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE}.Release|x86.Build.0 = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|x64.Build.0 = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Debug|x86.Build.0 = Debug|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|x64.Build.0 = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|x86.ActiveCfg = Release|Any CPU
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4}.Release|x86.Build.0 = Release|Any CPU
 		{70ACAF9B-A91A-46CB-A7EF-F4D2A0736510}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70ACAF9B-A91A-46CB-A7EF-F4D2A0736510}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70ACAF9B-A91A-46CB-A7EF-F4D2A0736510}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -295,18 +273,42 @@ Global
 		{B42A9284-DFA0-4C36-A683-DE0DAB05C3EF}.Release|x64.Build.0 = Release|Any CPU
 		{B42A9284-DFA0-4C36-A683-DE0DAB05C3EF}.Release|x86.ActiveCfg = Release|Any CPU
 		{B42A9284-DFA0-4C36-A683-DE0DAB05C3EF}.Release|x86.Build.0 = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|x64.Build.0 = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Debug|x86.Build.0 = Debug|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|x64.ActiveCfg = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|x64.Build.0 = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|x86.ActiveCfg = Release|Any CPU
-		{D193121C-49C8-47C6-A366-735D9B014E81}.Release|x86.Build.0 = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|x64.Build.0 = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A}.Release|x86.Build.0 = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|x64.Build.0 = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Debug|x86.Build.0 = Debug|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|x64.ActiveCfg = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|x64.Build.0 = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|x86.ActiveCfg = Release|Any CPU
+		{5374D25F-84B6-4ACA-B92E-21902410BE84}.Release|x86.Build.0 = Release|Any CPU
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|x64.ActiveCfg = Debug|x64
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|x64.Build.0 = Debug|x64
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|x86.ActiveCfg = Debug|x86
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Debug|x86.Build.0 = Debug|x86
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|x64.ActiveCfg = Release|x64
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|x64.Build.0 = Release|x64
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|x86.ActiveCfg = Release|x86
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -328,9 +330,7 @@ Global
 		{92BA3225-2F06-4988-9F0E-DA097DAEDB0E} = {25C9E706-270D-498F-934A-18F9FC7A6129}
 		{2E921C38-5F30-456D-A78C-4902C0432959} = {8FC42FA8-4EE7-4C6E-B1A9-55C70FA52A5A}
 		{A7ABF431-D7D6-4476-8BF9-A4D2631897FF} = {8EFA86FC-0FA7-4525-B952-71652A93B2E5}
-		{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
-		{12C03F62-BE32-4AAC-BED1-78B00C5B46FE} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
-		{7127F881-3A87-48F6-A04F-9EA5B74096F4} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
+		{6F58A7FF-7F1F-40A4-BA62-35DCD8BE7E69} = {EC243F60-6EE3-4022-B254-F8F7BB40AAA1}
 		{BD1E6B57-18E1-46E9-B16F-B531E88FB9E3} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
 		{70ACAF9B-A91A-46CB-A7EF-F4D2A0736510} = {BD1E6B57-18E1-46E9-B16F-B531E88FB9E3}
 		{90AD5C6D-668E-4703-BCE9-17AB584881EE} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
@@ -339,7 +339,10 @@ Global
 		{03E847A8-5A6E-47A1-B07E-F6148FBC587D} = {BD1E6B57-18E1-46E9-B16F-B531E88FB9E3}
 		{6BBFF719-3F6E-4296-8E08-7FE0B99A361E} = {BD1E6B57-18E1-46E9-B16F-B531E88FB9E3}
 		{B42A9284-DFA0-4C36-A683-DE0DAB05C3EF} = {BD1E6B57-18E1-46E9-B16F-B531E88FB9E3}
-		{D193121C-49C8-47C6-A366-735D9B014E81} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
+		{E97B4D11-EDAF-47CC-8436-2CCC1C21A20A} = {EC243F60-6EE3-4022-B254-F8F7BB40AAA1}
+		{EC243F60-6EE3-4022-B254-F8F7BB40AAA1} = {2407B11F-BCC6-46BC-85B0-CF64D74A441D}
+		{5374D25F-84B6-4ACA-B92E-21902410BE84} = {EC243F60-6EE3-4022-B254-F8F7BB40AAA1}
+		{7E34F52C-1AF7-4D4F-8A2B-441C35E1C824} = {EC243F60-6EE3-4022-B254-F8F7BB40AAA1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {520A2949-0926-487E-A33C-C1615B159589}

TweekApiDockerfile

@@ -1,21 +1,18 @@
 # ---- *.csproj FILES ----
-FROM microsoft/aspnetcore-build:2.0.0 as csproj-files
+FROM alpine as csproj-files
 COPY . /src
 RUN find /src -type f -not -name "*.csproj" -delete
 
-# ---- WARM UP NUGET ----
-FROM microsoft/aspnetcore-build:2.0.0 as nuget-cache
-COPY --from=csproj-files /src /src
-COPY ./Tweek.sln /src
-RUN dotnet restore ./src/Tweek.sln
-
 # ---- BUILD & TEST ----
-FROM nuget-cache as source
-COPY . /src
+FROM microsoft/aspnetcore-build:2.0.0 as source
+
 WORKDIR /src
+COPY --from=csproj-files /src .
+COPY ./Tweek.sln .
+RUN dotnet restore ./Tweek.sln
 
-RUN dotnet restore ./Tweek.sln && \
-    dotnet build Tweek.sln -c Release && \
+COPY . .
+RUN dotnet build Tweek.sln -c Release && \
     find . -regex '.*\.\(Unit\|Integration\|\)Tests\.csproj' -print0 | xargs -0 -n 1 -P 16 dotnet test -c=Release --no-build && \
     dotnet publish ./services/api/Tweek.ApiService.NetCore/Tweek.ApiService.NetCore.csproj  -c Release -o ./obj/Docker/publish