trying to fix docker build, so it includes git sha info.

AnalogJ · May 27, 2022 · d7ddf01 · d7ddf01
1 parent c539af1
commit d7ddf01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 && \