Skip to content

Commit

Permalink
Upgrade js-yaml [CROM-6825] (#736)
Browse files Browse the repository at this point in the history
* Changed to get dev ui docker image building

* Create volume for config file to be mounted into

* Targeted package upgrades

* Clarify test doc

* PR feedback
  • Loading branch information
jgainerdewar authored Dec 7, 2021
1 parent 6656751 commit 644b10a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
1 change: 1 addition & 0 deletions cromwell-instance-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
service: jmui
command: ["npm", "run-script", "ng", "--", "serve", "--host", "jmui"]
volumes:
- /ui/src/assets/environments/
- ${PWD}/ui/assets/environments/environment.cromwell.instance.json:/ui/src/assets/environments/environment.json
cromwell:
build:
Expand Down
5 changes: 4 additions & 1 deletion ui/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Note: This is the dockerfile for development purposes

FROM node
FROM node:14

# Install python 2, needed for npm packages
RUN apt-get update && apt-get -y install python

WORKDIR /ui
ADD package-lock.json package.json /ui/
Expand Down
2 changes: 1 addition & 1 deletion ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ng generate directive|pipe|service|class|guard|interface|enum|module
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.

## Running Tests
Unit tests are run via [Karma](https://karma-runner.github.io).
Unit tests are run via [Karma](https://karma-runner.github.io). Tests are typically run in CI after PR creation, not locally.
```
npm test
```
Expand Down
18 changes: 9 additions & 9 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 644b10a

Please sign in to comment.