diff --git a/.drone.yml b/.drone.yml index 06979f8..3226bfe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,7 +31,7 @@ steps: - name: clear image: docker:dind - depends_on: [ build_web ] + depends_on: [ build_web, build_jobs ] privileged: true failure: ignore volumes: @@ -39,6 +39,8 @@ steps: path: /var/run/docker.sock commands: - docker stop geen-web || true + - docker stop geen-jobs || true + - docker rm geen-web || true - docker rm geen-jobs || true - name: deploy diff --git a/build/Jobs.Dockerfile b/build/Jobs.Dockerfile index 89b9e23..469193a 100644 --- a/build/Jobs.Dockerfile +++ b/build/Jobs.Dockerfile @@ -1,7 +1,5 @@ ARG BUILD_NUMBER -FROM geen-frontend:$BUILD_NUMBER as frontend - FROM mcr.microsoft.com/dotnet/sdk:6.0.300-alpine3.14-amd64 AS build WORKDIR /app @@ -10,8 +8,6 @@ COPY ./src/Backend/ ./ WORKDIR /app/Geen.Jobs -COPY --from=frontend /app/dist wwwroot - RUN dotnet publish -c Release -o /app/out -r linux-musl-x64 --self-contained true /p:PublishReadyToRun=true /p:PublishSingleFile=true --packages packages FROM mcr.microsoft.com/dotnet/runtime-deps:6.0.5-alpine3.14-amd64 AS runtime