Skip to content

Commit

Permalink
Chore/dep update (#131)
Browse files Browse the repository at this point in the history
* update dep

* eslint

* update dep

* use npm 8

* fix: pin es pkg version

* update script

* update lock

* jest up

* clean up

* update lock

* override trim
  • Loading branch information
mfshao authored Feb 11, 2022
1 parent b10c23d commit 45c4b15
Show file tree
Hide file tree
Showing 9 changed files with 27,464 additions and 35,768 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ services:
- docker

before_install:
- npm install -g npm@7
- npm config set maxsockets 5
- npm install -g npm@8
- COMMIT=`git rev-parse HEAD` && echo "export const gitCommit = \"${COMMIT}\";" >src/server/version.js
- VERSION=`git describe --always --tags` && echo "export const gitVersion =\"${VERSION}\";" >>src/server/version.js

install:
- npm install
- npm ci

script:
- npm run eslint
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ RUN apt-get update \
&& curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y --no-install-recommends nodejs \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g npm@7 \
&& npm config set maxsockets 5
&& npm install -g npm@8

COPY . /guppy/
WORKDIR /guppy
Expand Down
3 changes: 0 additions & 3 deletions devHelper/docker/esearch.env

This file was deleted.

6 changes: 4 additions & 2 deletions devHelper/docker/esearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ services:
- es
volumes:
- "esdata:/usr/share/elasticsearch/data"
env_file:
- ./esearch.env
environment:
cluster.name: localdev
discovery.type: single-node
ES_JAVA_OPTS: "-Xms1g -Xmx1g"
deploy:
replicas: 1
restart_policy:
Expand Down
Loading

0 comments on commit 45c4b15

Please sign in to comment.