From 41bdbdcce710538e764e91b6fa38a043c829a579 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:01:36 +0200 Subject: [PATCH 01/12] Build improvements. --- .testrunsettings | 6 ++++++ Dockerfile | 7 +------ Dockerfile.build | 7 +------ 3 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 .testrunsettings diff --git a/.testrunsettings b/.testrunsettings new file mode 100644 index 000000000..0082141a9 --- /dev/null +++ b/.testrunsettings @@ -0,0 +1,6 @@ + + + + 4 + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 86485f677..7b5213883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,12 +19,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ && npm run build # Test Backend -RUN dotnet restore \ - && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ - && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj +RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies # Publish RUN dotnet publish src/Squidex/Squidex.csproj --output /out/alpine --configuration Release -r alpine.3.7-x64 diff --git a/Dockerfile.build b/Dockerfile.build index 30a5d3091..f1468b1e0 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -16,12 +16,7 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ && npm run build # Test Backend -RUN dotnet restore \ - && dotnet test --filter Category!=Dependencies tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj \ - && dotnet test tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj \ - && dotnet test tests/Squidex.Web.Tests/Squidex.Web.Tests.csproj +RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies # Publish RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Release \ No newline at end of file From 3502e679af697c94393419b38ae155369967d65f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:14:43 +0200 Subject: [PATCH 02/12] Share nuget folder. --- .drone.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index bc95a8247..04d7f8979 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,6 +28,8 @@ steps: path: /var/run/docker.sock - name: docker2 path: /var/lib/docker + - name: nuget + path: ~/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -51,6 +53,8 @@ steps: path: /var/run/docker.sock - name: docker2 path: /var/lib/docker + - name: nuget + path: ~/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -73,6 +77,8 @@ steps: path: /var/run/docker.sock - name: docker2 path: /var/lib/docker + - name: nuget + path: ~/.nuget/packages when: event: - tag @@ -154,4 +160,7 @@ volumes: path: /var/run/docker.sock - name: docker2 host: - path: /var/lib/docker \ No newline at end of file + path: /var/lib/docker + - name: nuget + host: + path: /var/lib/nuget \ No newline at end of file From 4e588c0d72b7c65b4c3fc3fe6c01ba4959f1c192 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:17:55 +0200 Subject: [PATCH 03/12] Test --- .testrunsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.testrunsettings b/.testrunsettings index 0082141a9..69a779394 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 4 + 6 \ No newline at end of file From 42ce42502b894e90f0c0714031024a77e13cd24d Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:21:16 +0200 Subject: [PATCH 04/12] Another attempt. --- .drone.yml | 4 ++-- .testrunsettings | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 04d7f8979..b9452ffb5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -29,7 +29,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: ~/.nuget/packages + path: /home/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -54,7 +54,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: ~/.nuget/packages + path: /home/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME diff --git a/.testrunsettings b/.testrunsettings index 69a779394..0082141a9 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 6 + 4 \ No newline at end of file From 331e39a1e19a282c8e76b645d0d3256f3488b049 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:23:28 +0200 Subject: [PATCH 05/12] FF --- .testrunsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.testrunsettings b/.testrunsettings index 0082141a9..69a779394 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 4 + 6 \ No newline at end of file From e71953030a121fe54a5d66d2912f295e5443de58 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:24:27 +0200 Subject: [PATCH 06/12] Pull Request fix. --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index b9452ffb5..e0e7ab7f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,6 +12,8 @@ steps: path: /var/run/docker.sock - name: docker2 path: /var/lib/docker + - name: nuget + path: /home/.nuget/packages when: event: - pull_request From 6c791e4e80914d97fba3c0bcf4825516f19be2a5 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:25:43 +0200 Subject: [PATCH 07/12] T --- .testrunsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.testrunsettings b/.testrunsettings index 69a779394..0082141a9 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 6 + 4 \ No newline at end of file From 311db4942cde17eb4b31057843e77b6435d2f1f4 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:28:33 +0200 Subject: [PATCH 08/12] Test --- .testrunsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.testrunsettings b/.testrunsettings index 0082141a9..ef537d413 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 4 + 5 \ No newline at end of file From df80cfd57cee3e36385c6e3cd531b2d575557da0 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:34:41 +0200 Subject: [PATCH 09/12] Nuget cache extraction test #1 --- .drone.yml | 8 ++++---- .testrunsettings | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index e0e7ab7f6..92b954985 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /home/.nuget/packages + path: /root/.nuget/packages/ when: event: - pull_request @@ -31,7 +31,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /home/.nuget/packages + path: /root/.nuget/packages/ environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -56,7 +56,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /home/.nuget/packages + path: /root/.nuget/packages/ environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -80,7 +80,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: ~/.nuget/packages + path: /root/.nuget/packages/ when: event: - tag diff --git a/.testrunsettings b/.testrunsettings index ef537d413..0082141a9 100644 --- a/.testrunsettings +++ b/.testrunsettings @@ -1,6 +1,6 @@ - 5 + 4 \ No newline at end of file From b68330af435a0178da4044111b9a46cd9d9aa0c7 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:51:45 +0200 Subject: [PATCH 10/12] Test --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7b5213883..e6750cb62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ && cd src/Squidex \ && npm run test:coverage \ && npm run build + +RUN find / -name "*.nupkg" # Test Backend RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies From 16921870eb236b58b32589ecffcd30d4043ac0b1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:58:09 +0200 Subject: [PATCH 11/12] A --- .drone.yml | 8 ++++---- Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 92b954985..26210c516 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /root/.nuget/packages/ + path: /root/.nuget/packages when: event: - pull_request @@ -31,7 +31,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /root/.nuget/packages/ + path: /root/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -56,7 +56,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /root/.nuget/packages/ + path: /root/.nuget/packages environment: DOCKER_USERNAME: from_secret: DOCKER_USERNAME @@ -80,7 +80,7 @@ steps: - name: docker2 path: /var/lib/docker - name: nuget - path: /root/.nuget/packages/ + path: /root/.nuget/packages when: event: - tag diff --git a/Dockerfile b/Dockerfile index e6750cb62..54958061e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,10 @@ FROM squidex/dotnet:2.2-sdk-chromium-phantomjs-node as builder WORKDIR /src +COPY . . + +RUN dotnet restore + COPY src/Squidex/package*.json /tmp/ # Install Node packages @@ -17,8 +21,6 @@ RUN cp -a /tmp/node_modules src/Squidex/ \ && cd src/Squidex \ && npm run test:coverage \ && npm run build - -RUN find / -name "*.nupkg" # Test Backend RUN dotnet restore && dotnet test -s ../../.testrunsettings --filter Category!=Dependencies From 4dd3a56691ba135130a5ed0e64ae2719bb6f55bb Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 19:03:08 +0200 Subject: [PATCH 12/12] Reverted --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54958061e..7b5213883 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,6 @@ FROM squidex/dotnet:2.2-sdk-chromium-phantomjs-node as builder WORKDIR /src -COPY . . - -RUN dotnet restore - COPY src/Squidex/package*.json /tmp/ # Install Node packages