Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker build issue resolution and security update on package management #63

Merged
merged 12 commits into from
Feb 16, 2019
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
7 changes: 5 additions & 2 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ assignees: BrandonSharratt

### ENV

<!-- Choose at least one of the following environments -->
`DEV`, `TEST`, `PROD`
<!-- Put at least one `x` below. Select all the environments which apply. -->

- [ ] `DEV`
- [ ] `TEST`
- [ ] `PROD`

### TESTCASE

Expand Down
16 changes: 8 additions & 8 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<!--- Provide a general summary of your changes in the Title above -->
<!-- Provide a general summary of your changes in the Title above -->

# Description

<!--- Describe your changes in detail -->
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
<!-- Describe your changes in detail -->
<!-- Why is this change required? What problem does it solve? -->
<!-- If it fixes an open issue, please link to the issue here. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
Expand All @@ -17,8 +17,8 @@

## Checklist

<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->

- [ ] I have read the [CONTRIBUTING](https://github.com/bcgov/OCWA/blob/master/CONTRIBUTING.md) doc
- [ ] I have checked that unit tests pass locally with my changes
Expand All @@ -27,4 +27,4 @@

## Further comments

<!--- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ matrix:
before_install:
- cd /home/travis/build/bcgov/OCWA/microservices/forumApi
- npm install
- npm audit

script:
- cd /home/travis/build/bcgov/OCWA/microservices/forumApi
Expand Down Expand Up @@ -103,6 +104,7 @@ matrix:
- cp config/test.json.example config/test.json
- cp config/default.json.example config/default.json
- npm install
- npm audit
- cd /home/travis/build/bcgov/OCWA/microservices/forumApi
- npm install
- cp config/default.json.example config/default.json
Expand Down Expand Up @@ -291,6 +293,8 @@ matrix:
- cd /home/travis/build/bcgov/OCWA/frontend
- cp config/test.json.example config/test.json
- yarn
- npm i --package-lock-only
- npm audit
- npm test
- helm lint helm/ocwa-frontend
- bash docker_quayio_push ocwa_frontend
Expand Down Expand Up @@ -373,7 +377,6 @@ matrix:
- cd /home/travis/build/bcgov/OCWA
- helm lint helm/ocwa


env:
global:
- HELM_URL=https://storage.googleapis.com/kubernetes-helm
Expand Down
14 changes: 6 additions & 8 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"start": "cross-env NODE_ENV=development nodemon server/index.js",
"start:prod": "cross-env NODE_ENV=production node server/index.js",
"build": "cross-env NODE_ENV=production webpack --config webpack.prod.js",
"test": "jest --coverage",
"snyk-protect": "snyk protect",
"prepublish": "npm run snyk-protect"
"test": "jest --coverage"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
Expand All @@ -21,7 +19,7 @@
"@babel/preset-react": "^7.0.0",
"babel-core": "^7.0.0-bridge",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-jest": "^24.1.0",
"babel-loader": "^8.0.2",
"babel-minify-webpack-plugin": "^0.3.1",
"clean-webpack-plugin": "^0.1.19",
Expand All @@ -35,20 +33,20 @@
"eslint-plugin-jest": "^21.24.1",
"eslint-plugin-jsx-a11y": "^6.1.1",
"eslint-plugin-react": "^7.11.1",
"jest": "^23.6.0",
"jest": "^24.1.0",
"mini-css-extract-plugin": "^0.4.4",
"nodemon": "^1.18.4",
"redux-logger": "^3.0.6",
"style-loader": "^0.23.0",
"supertest": "2.0.1",
"supertest": "3.4.2",
"supertest-as-promised": "4.0.2",
"terser-webpack-plugin": "^1.1.0",
"uglifyjs-webpack-plugin": "^2.0.1",
"webpack": "^4.18.0",
"webpack-bundle-analyzer": "^3.0.3",
"webpack-cli": "^3.1.2",
"webpack-dev-middleware": "^3.3.0",
"webpack-dev-server": "^3.1.8",
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.0",
"webpack-manifest-plugin": "^2.0.4",
"webpack-merge": "^4.1.4"
Expand Down Expand Up @@ -91,7 +89,7 @@
"connect-history-api-fallback": "^1.5.0",
"cookie-parser": "^1.4.3",
"express": "~4.16.0",
"express-manifest-helpers": "^0.5.0",
"express-manifest-helpers-upgraded": "^0.7.1",
"express-session": "^1.15.6",
"faker": "^4.1.0",
"filesize": "^3.6.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const get = require('lodash/get');
const path = require('path');
const passport = require('passport');
const session = require('express-session');
const manifestHelpers = require('express-manifest-helpers');
const manifestHelpers = require('express-manifest-helpers-upgraded');
const MemoryStore = require('memorystore')(session);
const webpack = require('webpack');
const webpackDevMiddleware = require('webpack-dev-middleware');
Expand Down
Loading