Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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