From c0f950e4a78b01281a467696e7e8ffdc43d4c27a Mon Sep 17 00:00:00 2001 From: eiximenis Date: Wed, 29 May 2019 08:49:21 +0200 Subject: [PATCH] fixing webspa build for windows, to use node-windows image --- build/azure-devops/webspa/azure-pipelines.yml | 4 +++- docker-compose.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/azure-devops/webspa/azure-pipelines.yml b/build/azure-devops/webspa/azure-pipelines.yml index 7f7618f70..3b8747610 100644 --- a/build/azure-devops/webspa/azure-pipelines.yml +++ b/build/azure-devops/webspa/azure-pipelines.yml @@ -60,6 +60,7 @@ jobs: projectName: "" dockerComposeFileArgs: | TAG=$(Build.SourceBranchName) + NODE_IMAGE=stefanscherer/node-windows:8.11 PLATFORM=win - task: DockerCompose@0 displayName: Compose push webspa @@ -72,4 +73,5 @@ jobs: projectName: "" dockerComposeFileArgs: | TAG=$(Build.SourceBranchName) - PLATFORM=win \ No newline at end of file + PLATFORM=win + NODE_IMAGE=stefanscherer/node-windows:8.11 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8c523e122..8950bdfe2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -214,6 +214,8 @@ services: build: context: . dockerfile: src/Web/WebSPA/Dockerfile + args: + - NODE_IMAGE=${NODE_IMAGE:-node:8.11} # depends_on: # - webshoppingagg # - webshoppingapigw