From d7ddf01ea023e8d2da46f67960c80845729192ea Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Thu, 26 May 2022 23:04:57 -0700 Subject: [PATCH] trying to fix docker build, so it includes git sha info. --- docker/Dockerfile | 3 ++- docker/Dockerfile.web | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6db99d2..a94c53f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,9 +17,10 @@ FROM node:lts-slim as frontendbuild ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false WORKDIR /opt/scrutiny/src -COPY webapp/frontend /opt/scrutiny/src +COPY . /opt/scrutiny/src RUN apt-get update && apt-get install -y git && \ + cd webapp/frontend && \ npm install -g @angular/cli@9.1.4 && \ mkdir -p /scrutiny/dist && \ npm install && \ diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index b6015a8..e58d6e8 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -15,9 +15,10 @@ FROM node:lts-slim as frontendbuild ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false WORKDIR /opt/scrutiny/src -COPY webapp/frontend /opt/scrutiny/src +COPY . /opt/scrutiny/src RUN apt-get update && apt-get install -y git && \ + cd webapp/frontend && \ npm install -g @angular/cli@9.1.4 && \ mkdir -p /opt/scrutiny/dist && \ npm install && \