cleaning up docker scripts

Author: mac-s-g

.travis.yml

@@ -7,4 +7,4 @@ language: node_js
 node_js:
   - "8"
 script:
- - ./docker/test-travis.sh
+ - ./docker/test.sh

docker/README.md

@@ -1,3 +1,32 @@
+### Contrubiting to this Project
+#### Run the Dev Server
+To use Docker to run the source code in a local development environment:
+  1. Clone this repo
+  2. Build the docker image
+      * `cd react-json-view`
+      * `./docker/build-container.sh`
+      * *note:* you may need to use `sudo` to run docker commands
+  3. Run the docker container on port 2000.  This will run the webpack-dev-server with hot-reloading enabled.
+      * `./docker/dev-server.sh`
+      * *note:* you may need to use `sudo` to run the server file
+  4. Open port 2000 in your browser
+      * navigate to localhost:2000
+
+Your source code will be mounted inside the docker container.  The container is built on the latest `Node:slim` image.
+
+Webpack-dev-server is running in the container and hot-reloading when changes are made locally.
+
+All node modules are installed within the container, so make sure to rebuild your container if you make changes to package.json (see step 2, above).
+
+#### Run the Production Build
+```bash
+cd react-json-view
+# build the rjv container
+./docker/build-container.sh
+# run the build within your docker container
+./docker/build-dist.sh
+```
+
 ### Motivation for adding Docker to your Development Stack
 
 **PSA:** You do not need to use Docker to contribute to this project.  If you're not interested in using a container for development, you can ignore this directory.
@@ -68,32 +97,3 @@ running the app inside a container ensures that environmental inconsistencies li
 #### more examples
 
 [github-help-wanted](https://github.com/mac-s-g/github-help-wanted) is a newer project that has a simpler docker workflow.
-
-### Contrubiting to this Project
-#### Run the Dev Server
-To use Docker to run the source code in a local development environment:
-  1. Clone this repo
-  2. Build the docker image
-      * `cd react-json-view`
-      * `./docker/build-container.sh`
-      * *note:* you may need to use `sudo` to run docker commands
-  3. Run the docker container on port 2000.  This will run the webpack-dev-server with hot-reloading enabled.
-      * `./docker/dev-server.sh`
-      * *note:* you may need to use `sudo` to run the server file
-  4. Open port 2000 in your browser
-      * navigate to localhost:2000
-
-Your source code will be mounted inside the docker container.  The container is built on the latest `Node:slim` image.
-
-Webpack-dev-server is running in the container and hot-reloading when changes are made locally.
-
-All node modules are installed within the container, so make sure to rebuild your container if you make changes to package.json (see step 2, above).
-
-#### Run the Production Build
-```bash
-cd react-json-view
-# build the rjv container
-./docker/build-container.sh
-# run the build within your docker container
-./docker/build-dist.sh
-```

docker/entrypoints/dev-server.sh

@@ -3,4 +3,4 @@
 
 mkdir -p /react/dist || true
 cd /react
-exec npm run dev:hot
+exec npm run dev

docker/entrypoints/test-travis.sh renamed to docker/entrypoints/test-watch.sh

@@ -2,4 +2,4 @@
 echo Running Tests
 cd /react
 
-exec npm run test
+exec npm run test:watch

docker/entrypoints/test.sh

@@ -2,4 +2,4 @@
 echo Running Tests
 cd /react
 
-exec npm run test:watch
+exec npm run test

docker/test-travis.sh renamed to docker/test-watch.sh

@@ -7,11 +7,11 @@ echo "Running with NODE_ENV=$NODE_ENV"
 # run the workbench container
 docker run \
     -v $(pwd)/src:/react/src \
-    -v $(pwd)/coverage:/react/coverage \
+    -v $(pwd)/dev-server:/react/dev-server \
     -v $(pwd)/webpack/webpack.config.js:/react/webpack.config.js \
     -v $(pwd)/test:/react/test \
     -v $(pwd)/docker:/react/docker \
     --rm \
     -e NODE_ENV=$NODE_ENV \
-    --entrypoint=/react/docker/entrypoints/test-travis.sh \
-    -t react-json-view
+    --entrypoint=/react/docker/entrypoints/test-watch.sh \
+    -t react-json-view

docker/test.sh

@@ -7,11 +7,11 @@ echo "Running with NODE_ENV=$NODE_ENV"
 # run the workbench container
 docker run \
     -v $(pwd)/src:/react/src \
-    -v $(pwd)/dev-server:/react/dev-server \
+    -v $(pwd)/coverage:/react/coverage \
     -v $(pwd)/webpack/webpack.config.js:/react/webpack.config.js \
     -v $(pwd)/test:/react/test \
     -v $(pwd)/docker:/react/docker \
     --rm \
     -e NODE_ENV=$NODE_ENV \
     --entrypoint=/react/docker/entrypoints/test.sh \
-    -t react-json-view
+    -t react-json-view