From c38d576e86598e5bbb17c3e39137848919f4f866 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Fri, 11 May 2018 19:22:23 -0700 Subject: [PATCH] Deleted the docker-compose.ci.build.yml file as we don't need it anymore since we're using DOCKER MULTI-STAGE BUILDS. --- docker-compose.ci.build.yml | 19 ------------------- docker-compose.dcproj | 1 - 2 files changed, 20 deletions(-) delete mode 100644 docker-compose.ci.build.yml diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml deleted file mode 100644 index 747e8e58..00000000 --- a/docker-compose.ci.build.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3.4' - -services: - ci-build: - image: microsoft/aspnetcore-build:2.0.2 #Depending on the bug below, you can also try this other SDK image: microsoft/aspnetcore-build:1.0-2.0-2017-10 or microsoft/aspnetcore-build:1.0-2.0 - volumes: - - .:/src - - ./cli-linux:/cli-linux - working_dir: /src - - -# Next line is using the .sln file to compile all the projects. -# Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153) -# Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure. - command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && dotnet publish ./eShopOnContainers-ServicesAndWebApps.sln -c Release -o ./obj/Docker/publish" - -# NOTE: Using build-bits-linux.sh from Linux build container exits before ending. - #command: /bin/bash -c "pushd ./src/Web/WebSPA && npm rebuild node-sass && popd && pushd /cli-linux && ./build-bits-linux.sh /src" - \ No newline at end of file diff --git a/docker-compose.dcproj b/docker-compose.dcproj index d1f485b0..296c4b5e 100644 --- a/docker-compose.dcproj +++ b/docker-compose.dcproj @@ -11,7 +11,6 @@ - docker-compose.yml