Skip to content
This repository has been archived by the owner on Sep 12, 2022. It is now read-only.

Commit

Permalink
Merge pull request #811 from calvinmclean/npm-install
Browse files Browse the repository at this point in the history
Run npm install as part of the Docker build process
  • Loading branch information
Calvin McLean authored Jun 10, 2019
2 parents 40df8c0 + 1acd541 commit bd1cb89
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
- Alert message to the Resource Request Modal for Jetstream users explaining JTA restrictions
- Added Dockerfile and related files to enable automated Dockerhub build/test
([#800](https://github.com/cyverse/troposphere/pull/800))
- Run npm install as part of Dockerfile
([#811](https://github.com/cyverse/troposphere/pull/811))
- Add sort options to instance and volume tables in project resources

### Changed
- Update `psycopg` requirement to version 2.7.3.1
([#795](https://github.com/cyverse/troposphere/pull/795))
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ RUN apt-get autoremove -y && \
RUN openssl dhparam -out /etc/ssl/certs/dhparam.pem 1024 && \
cp -r docker/nginx/ /etc/

RUN npm install --unsafe-perm

RUN useradd user

# Prepare entrypoint
Expand Down

0 comments on commit bd1cb89

Please sign in to comment.