Skip to content

Commit 4159123

Browse files
authored
Merge branch 'dev' into about-update
2 parents 53c3801 + e18545e commit 4159123

File tree

14 files changed

+8685
-15998
lines changed

14 files changed

+8685
-15998
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ jobs:
1010
- name: Setup Node.js
1111
uses: actions/setup-node@v2
1212
with:
13-
node-version: '10.13'
13+
node-version: '12.18'
1414
- name: Setup cache
1515
uses: actions/cache@v2
1616
with:
1717
path: node_modules
1818
key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
1919
- name: Fetch packages
20-
run: npm ci
20+
run: npm install
2121
- name: Setup Test Environment
2222
run: |
2323
docker-compose up -d database
@@ -26,4 +26,4 @@ jobs:
2626
run: npm test -- --forceExit
2727
- name: Tear down test environment
2828
run: |
29-
docker-compose down
29+
docker-compose down

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM node:10.13
1+
FROM node:12.18
22

33
WORKDIR /app
44
COPY . /app
55

6-
RUN npm install
6+
RUN npm install

docker-compose.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ version: '3'
22

33
services:
44
database:
5-
container_name: database
65
image: mongo
76
ports:
87
- "27017:27017"
@@ -36,4 +35,4 @@ services:
3635
environment:
3736
MONGO_CONNECTION_STRING: 'mongodb://database:27017/ecg-myr'
3837
working_dir: /app
39-
command: npm start
38+
command: npm start

0 commit comments

Comments
 (0)