Skip to content

Commit

Permalink
Add Node 8 and remove Node 7 support for Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
bkimminich committed Jun 14, 2017
1 parent cb45ce0 commit 6647130
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 19 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: node_js
node_js:
- 4
- 6 # recommended version
- 7
- 8
branches:
except:
Expand Down
13 changes: 1 addition & 12 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,6 @@ module.exports = function (grunt) {
to: '<%= pkg.version %>'
}]
},
node7: {
src: ['docker/Dockerfile.template'],
dest: 'node7.df',
replacements: [{
from: '%%NODE_VERSION%%',
to: '7'
}, {
from: '%%APP_VERSION%%',
to: '<%= pkg.version %>'
}]
},
node8: {
src: ['docker/Dockerfile.template'],
dest: 'node8.df',
Expand All @@ -161,5 +150,5 @@ module.exports = function (grunt) {

grunt.registerTask('minify', [ 'clean:dist', 'concat:js', 'uglify:js', 'ngtemplates:juiceShop', 'concat:dist', 'uglify:dist', 'clean:temp' ])
grunt.registerTask('package', [ 'clean:pckg', 'minify', 'compress:pckg' ])
grunt.registerTask('docker', [ 'replace:dockerfile', 'replace:node6', 'replace:node4', 'replace:node7', 'replace:node8' ])
grunt.registerTask('docker', [ 'replace:dockerfile', 'replace:node6', 'replace:node4', 'replace:node8' ])
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ OWASP Juice Shop officially supports the following versions of
[node.js](http:https://nodejs.org) and offers Docker images and packaged
distributions accordingly:

| node.js | [Docker images](https://registry.hub.docker.com/u/bkimminich/juice-shop) | Docker snapshots | [Packaged distributions](https://github.com/bkimminich/juice-shop/releases/latest) |
|:--------|:-------------------------------------------------------------------------|:---------------------------------------------------------|:-----------------------------------------------------------------------------------------|
| 4.x | `node4` | `node4-snapshot`, `node4-develop` | `juice-shop-<version>_node4_windows_x64.zip`, `juice-shop-<version>_node4_linux_x64.tgz` |
| __6.x__ | __`latest`__, `node6` | `snapshot`, `develop`, `node6-snapshot`, `node6-develop` | `juice-shop-<version>_node6_windows_x64.zip`, `juice-shop-<version>_node6_linux_x64.tgz` |
| 7.x | `node7` | `node7-snapshot`, `node7-develop` | `juice-shop-<version>_node7_windows_x64.zip`, `juice-shop-<version>_node7_linux_x64.tgz` |
| node.js | [Docker images](https://registry.hub.docker.com/u/bkimminich/juice-shop) (from `master`) | Docker snapshots (from `develop`) | [Packaged distributions](https://github.com/bkimminich/juice-shop/releases/latest) |
|:--------|:-----------------------------------------------------------------------------------------|:----------------------------------|:-----------------------------------------------------------------------------------------|
| 4.x | `node4` | `node4-snapshot` | `juice-shop-<version>_node4_windows_x64.zip`, `juice-shop-<version>_node4_linux_x64.tgz` |
| __6.x__ | __`latest`__, `node6` | `snapshot`, `node6-snapshot` | `juice-shop-<version>_node6_windows_x64.zip`, `juice-shop-<version>_node6_linux_x64.tgz` |
| 8.x | `node8` | `node8-snapshot` | `juice-shop-<version>_node8_windows_x64.zip`, `juice-shop-<version>_node8_linux_x64.tgz` |

> The stable Docker images are built from `master` while the snapshot
> images are built from `develop` branch. The latter contain unreleased
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"stryker": "stryker run stryker.client-conf.js"
},
"engines": {
"node": "~4 ~6 ~7 ~8"
"node": "~4 ~6 8"
},
"standard": {
"ignore": [
Expand Down

0 comments on commit 6647130

Please sign in to comment.