-
Notifications
You must be signed in to change notification settings - Fork 72k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from nightscout/master
Update NS
- Loading branch information
Showing
277 changed files
with
45,082 additions
and
23,837 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| [config] | ||
| command = bash deploy.sh | ||
| command = bash bin/azure-deploy.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,35 @@ | ||
| module.exports = { | ||
| "plugins": [ ], | ||
| "extends": [ | ||
| "eslint:recommended" | ||
| 'plugins': [ | ||
| 'security' | ||
| ], | ||
| "parser": "babel-eslint", | ||
| "env": { | ||
| "browser": true, | ||
| "commonjs": true, | ||
| "es6": true, | ||
| "node": true, | ||
| "mocha": true, | ||
| "jquery": true | ||
| 'extends': [ | ||
| 'eslint:recommended', | ||
| 'plugin:security/recommended' | ||
| ], | ||
| 'parser': 'babel-eslint', | ||
| 'env': { | ||
| 'browser': true, | ||
| 'commonjs': true, | ||
| 'es6': true, | ||
| 'node': true, | ||
| 'mocha': true, | ||
| 'jquery': true | ||
| }, | ||
| "rules": { | ||
| "no-unused-vars": [ | ||
| "error", | ||
| 'rules': { | ||
| 'security/detect-object-injection' : 0, | ||
| 'no-unused-vars': [ | ||
| 'error', | ||
| { | ||
| "varsIgnorePattern": "should|expect" | ||
| 'varsIgnorePattern': 'should|expect' | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| 'overrides': [ | ||
| { | ||
| 'files': ['lib/client/*.js'], | ||
| 'rules': { | ||
| 'security/detect-object-injection': 0 | ||
| } | ||
| } | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,90 @@ | ||
| name: CI test | ||
| name: CI test and publish Docker image | ||
|
|
||
| on: [push, pull_request] | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - dev | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| - dev | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-16.04 | ||
|
|
||
| test: | ||
| name: Run Tests | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| node-version: [12.x] | ||
| node-version: [12.x, 14.x, 16.x] | ||
| mongodb-version: [4.2, 4.4] | ||
|
|
||
| steps: | ||
| - name: Git Checkout | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
|
|
||
| - name: Start MongoDB ${{ matrix.mongodb-version }} | ||
| uses: supercharge/[email protected] | ||
| with: | ||
| mongodb-version: ${{ matrix.mongodb-version }} | ||
|
|
||
| - name: Install dependencies | ||
| run: npm install | ||
| - name: Run Tests | ||
| run: npm run-script test-ci | ||
| - name: Send Coverage | ||
| run: npm run-script coverage | ||
|
|
||
| publish: | ||
| name: Publish to Docker Hub | ||
| needs: test | ||
| runs-on: ubuntu-latest | ||
| if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev') && github.repository_owner == 'nightscout' | ||
| env: | ||
| DOCKER_IMAGE: nightscout/cgm-remote-monitor | ||
| PLATFORMS: linux/amd64,linux/arm64 | ||
| steps: | ||
| - uses: actions/checkout@v1 | ||
| - name: Use Node.js ${{ matrix.node-version }} | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: ${{ matrix.node-version }} | ||
| - name: Install dependencies | ||
| run: npm install | ||
| - name: Install MongoDB | ||
| run: | | ||
| wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add - | ||
| echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list | ||
| sudo apt-get update | ||
| sudo apt-get install -y mongodb-org | ||
| sudo apt-get install -y --allow-downgrades mongodb-org=4.4.0 mongodb-org-server=4.4.0 mongodb-org-shell=4.4.0 mongodb-org-mongos=4.4.0 mongodb-org-tools=4.4.0 | ||
| - name: Start MongoDB | ||
| run: sudo systemctl start mongod | ||
| - name: Run Tests | ||
| run: npm run-script test-ci | ||
| - name: Send Coverage | ||
| run: npm run-script coverage | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v1 | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v1 | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v1 | ||
| with: | ||
| username: ${{ secrets.DOCKER_USER }} | ||
| password: ${{ secrets.DOCKER_PASS }} | ||
| - name: Clean git Checkout | ||
| if: success() | ||
| uses: actions/checkout@v2 | ||
| - name: Build, tag and push the dev Docker image | ||
| if: success() && github.ref == 'refs/heads/dev' | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| context: . | ||
| push: true | ||
| no-cache: true | ||
| platforms: ${{ env.PLATFORMS }} | ||
| tags: | | ||
| ${{ env.DOCKER_IMAGE }}:dev_${{ github.sha }} | ||
| ${{ env.DOCKER_IMAGE }}:latest_dev | ||
| - name: Get Nightscout release version | ||
| if: success() && github.ref == 'refs/heads/master' | ||
| id: package-version | ||
| uses: martinbeentjes/npm-get-version-action@master | ||
| - name: Build, tag and push the master Docker image | ||
| if: success() && github.ref == 'refs/heads/master' | ||
| uses: docker/build-push-action@v2 | ||
| with: | ||
| context: . | ||
| push: true | ||
| no-cache: true | ||
| platforms: ${{ env.PLATFORMS }} | ||
| tags: | | ||
| ${{ env.DOCKER_IMAGE }}:${{ steps.package-version.outputs.current-version }} | ||
| ${{ env.DOCKER_IMAGE }}:latest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 10.16.0 | ||
| 14.15.3 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| FROM node:14.15.3-alpine | ||
|
|
||
| LABEL maintainer="Nightscout Contributors" | ||
|
|
||
| WORKDIR /opt/app | ||
| ADD . /opt/app | ||
|
|
||
| # TODO: We should be able to do `RUN npm install --only=production`. | ||
| # For this to work, we need to copy only package.json and things needed for `npm`'s to succeed. | ||
| # TODO: Do we need to re-add `npm audit fix`? Or should that be part of a development process/stage? | ||
| RUN npm install --cache /tmp/empty-cache && \ | ||
| npm run postinstall && \ | ||
| npm run env && \ | ||
| rm -rf /tmp/* | ||
| # TODO: These should be added in the future to correctly cache express-minify content to disk | ||
| # Currently, doing this breaks the browser cache. | ||
| # mkdir /tmp/public && \ | ||
| # chown node:node /tmp/public | ||
|
|
||
| USER node | ||
| EXPOSE 1337 | ||
|
|
||
| CMD ["node", "lib/server/server.js"] |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.