Skip to content

Commit

Permalink
chore: use node-dev Docker image
Browse files Browse the repository at this point in the history
Signed-off-by: Eric Dobbertin <eric@dairystatedesigns.com>
  • Loading branch information
aldeed committed Oct 21, 2019
1 parent 9e60f3d commit c50b53d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 94 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10.16.3
26 changes: 0 additions & 26 deletions .reaction/entrypoint.sh

This file was deleted.

34 changes: 0 additions & 34 deletions .reaction/fix-volumes.sh

This file was deleted.

15 changes: 0 additions & 15 deletions .reaction/yarnrc-docker.template

This file was deleted.

10 changes: 0 additions & 10 deletions Dockerfile.dev

This file was deleted.

15 changes: 7 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# This docker-compose file is used to run the Example Storefront in Docker for development.
# The local files are mounted into the created container.
# Usage: docker-compose up [-d]

version: '3.4'

networks:
Expand All @@ -10,9 +14,7 @@ networks:

services:
web:
build:
context: .
dockerfile: 'Dockerfile.dev'
image: reactioncommerce/node-dev:10.16.3-v2
env_file:
- ./.env
networks:
Expand All @@ -23,16 +25,13 @@ services:
ports:
- 4000:4000
volumes:
- $HOME/.cache/yarn-offline-mirror:/home/node/.cache/yarn-offline-mirror
- web-yarn:/home/node/.cache/yarn
- .:/usr/local/src/reaction-app
- .:/usr/local/src/app
# Do not link in node_modules from the host
# This allows IDEs to run lint etc with native add-ons for host OS
# Without interfering with native add-ons in container
- empty_node_modules:/usr/local/src/reaction-app/node_modules
- node_modules:/usr/local/src/node_modules
- empty_node_modules:/usr/local/src/app/node_modules

volumes:
web-yarn:
node_modules:
empty_node_modules:
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
"license": "Apache-2.0",
"sideEffects": false,
"scripts": {
"dev": "NODE_ENV=development node ./src/server.js",
"dev": "echo 'Note: dev script has been renamed to start:dev' && yarn run start:dev",
"build": "yarn run build-clean && NODE_ENV=production IS_BUILDING_NEXTJS=1 next build src",
"build-clean": "rimraf build/app",
"lint": "eslint .",
"start": "NODE_ENV=production node ./src/server.js",
"start:dev": "NODE_ENV=development node ./src/server.js",
"test": "yarn run test:unit",
"test:ci": "yarn run test:unit --ci --runInBand --colors",
"test:unit": "NODE_ENV=jesttest jest",
Expand Down

0 comments on commit c50b53d

Please sign in to comment.