gilles/scrutiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jason Kulatunga
2022-05-26 22:53:00 -07:00
parent d93d24b52d
commit c539af1a67
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/docker-build.yaml
+3 -1
View File
@@ -20,7 +20,9 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx
docker/Dockerfile
+2 -1
View File
@@ -19,7 +19,8 @@ ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
WORKDIR /opt/scrutiny/src WORKDIR /opt/scrutiny/src
COPY webapp/frontend /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 && \ mkdir -p /scrutiny/dist && \
npm install && \ npm install && \
npm run build:prod -- --output-path=/opt/scrutiny/dist npm run build:prod -- --output-path=/opt/scrutiny/dist
docker/Dockerfile.web
+2 -1
View File
@@ -17,7 +17,8 @@ ENV NPM_CONFIG_LOGLEVEL=warn NG_CLI_ANALYTICS=false
WORKDIR /opt/scrutiny/src WORKDIR /opt/scrutiny/src
COPY webapp/frontend /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 && \ mkdir -p /opt/scrutiny/dist && \
npm install && \ npm install && \
npm run build:prod -- --output-path=/opt/scrutiny/dist npm run build:prod -- --output-path=/opt/scrutiny/dist