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

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

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -20,7 +20,9 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -19,7 +19,8 @@ ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
 WORKDIR /opt/scrutiny/src
 COPY webapp/frontend /opt/scrutiny/src
 
-RUN npm install -g @angular/cli@9.1.4 && \
+RUN apt-get update && apt-get install -y git && \
+    npm install -g @angular/cli@9.1.4 && \
     mkdir -p /scrutiny/dist && \
     npm install && \
     npm run build:prod -- --output-path=/opt/scrutiny/dist

diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web
@@ -17,7 +17,8 @@ ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
 WORKDIR /opt/scrutiny/src
 COPY webapp/frontend /opt/scrutiny/src
 
-RUN npm install -g @angular/cli@9.1.4 && \
+RUN apt-get update && apt-get install -y git && \
+    npm install -g @angular/cli@9.1.4 && \
     mkdir -p /opt/scrutiny/dist && \
     npm install && \
     npm run build:prod -- --output-path=/opt/scrutiny/dist