Skip to content

Commit

Permalink
Merge pull request #599 from mitre-attack/fix/598-docker
Browse files Browse the repository at this point in the history
Fix/598 docker
  • Loading branch information
clemiller authored Nov 3, 2023
2 parents 4c81dd8 + 1b5bfb4 commit 972ac66
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
This will patch the version number appropriately and create the correct tag on the current commit.
The creation of the tag can be disabled with the --no-git-tag-version if desired.
-->
# Staged Changes

## Fixes
- Fixed an issue with the Dockerfile which was preventing the docker image from building. See issue [#598](https://github.com/mitre-attack/attack-navigator/pull/598).

# 4.9.0 - 31 October 2023

Expand Down
17 changes: 4 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,13 @@ ENV NODE_OPTIONS=--openssl-legacy-provider

# install node packages - cache for faster future builds
WORKDIR /src/nav-app
COPY nav-app/package*.json nav-app/patch-webpack.js .
# install packages and build
RUN npm install --unsafe-perm --legacy-peer-deps

# NOTE on legacy-peer-deps:
# The --legacy-peer-deps flags is included to bypass the dependency peer resolution conflict that arises between Angular
# and @angular-devkit/[email protected], the latter of which has peerDependency: karma: '~5.1.0'. However,
# upgrading karma to 5.1.0 cascades into a litany of other dependency conflicts, which would ultimately require us to
# upgrade from Angular v11 to v12. Therefore, legacy-peer-deps will be allowed until a major framework upgrade can occur
COPY ./nav-app/package*.json ./

# give user permissions
RUN chown -R node:node ./
# install packages and build
RUN npm install

# copy over needed files
USER node
COPY nav-app/ ./
COPY ./nav-app/ ./

WORKDIR /src
COPY layers/*.md ./layers/
Expand Down

0 comments on commit 972ac66

Please sign in to comment.