From c539af1a67461bf6c10394a13e40bd64cd00b975 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Thu, 26 May 2022 22:53:00 -0700 Subject: [PATCH] trying to fix docker build, so it includes git sha info. --- .github/workflows/docker-build.yaml | 4 +++- docker/Dockerfile | 3 ++- docker/Dockerfile.web | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 7d2a54b..2bd7393 100644 --- 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 index b6cc906..6db99d2 100644 --- 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 index 7e1e959..b6015a8 100644 --- 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