From 16921870eb236b58b32589ecffcd30d4043ac0b1 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Jun 2019 18:58:09 +0200 Subject: [PATCH] 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