From c33e38dfbb04ef4d9daf40d9183a04b6a6ead92d Mon Sep 17 00:00:00 2001 From: Alex Mikhalev Date: Thu, 6 Dec 2018 15:28:35 -0800 Subject: [PATCH] Fixed Docker to use stretch image and not fail build --- Dockerfile | 11 +++-------- Dockerfile.dev | 7 +------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddf48c3..508f52a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,4 @@ -FROM node:alpine as builder - -RUN apk add yarn \ - python \ - make \ - g++ +FROM node:10 as builder WORKDIR /app/ @@ -11,7 +6,7 @@ COPY package.json yarn.lock /app/ RUN yarn install --frozen-lockfile COPY tslint.json /app -COPY app/ /app/app +COPY client/ /app/client COPY common/ /app/common COPY server/ /app/server @@ -19,7 +14,7 @@ RUN yarn build RUN yarn install --frozen-lockfile --production -FROM node:alpine +FROM node:10 WORKDIR /app/ diff --git a/Dockerfile.dev b/Dockerfile.dev index 454ad54..0cc9aa6 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,9 +1,4 @@ -FROM node:alpine - -RUN apk add yarn \ - python \ - make \ - g++ +FROM node:10 WORKDIR /app/