Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade js-yaml [CROM-6825] #736

Merged
merged 5 commits into from
Dec 7, 2021
Merged

Upgrade js-yaml [CROM-6825] #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8bb9a60
Changed to get dev ui docker image building
jgainerdewar Dec 3, 2021
cdcf5a9
Create volume for config file to be mounted into
jgainerdewar Dec 6, 2021
0371dfe
Targeted package upgrades
jgainerdewar Dec 6, 2021
5abb53b
Clarify test doc
jgainerdewar Dec 6, 2021
57b9d39
PR feedback
jgainerdewar Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cromwell-instance-compose.yml
View file
Open in desktop
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/
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Create a volume for the below config file to be mounted into. I only 60% understand why this was needed - it's related to the fact that ui/src is already separately mounted in the compose file this one inherits from. Without this, the mounted config file was always empty.

- ${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
View file
Open in desktop
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
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specify (downgrade) node version to fix C compilation errors (see here).


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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Explicitly install Python because otherwise it can't be found when needed during npm install.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you either leave a comment or specify explicitly in the code whether this is python2 or python3?

It is confusing (and not your fault) that package managers/OSes use the same name even if they are installed concurrently!


WORKDIR /ui
ADD package-lock.json package.json /ui/
Expand Down
2 changes: 1 addition & 1 deletion ui/README.md
View file
Open in desktop
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
View file
Open in desktop

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