Merge pull request #653 from reactioncommerce/chore-dc-network-rename

chore: reconfigure docker-compose networks

Author: aldeed

.env.example

@@ -1,17 +1,17 @@
 CANONICAL_URL=http://localhost:4000
 ENABLE_SPA_ROUTING=true
 EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql
-INTERNAL_GRAPHQL_URL=http://api.api.reaction.localhost:3000/graphql
+INTERNAL_GRAPHQL_URL=http://api.reaction.localhost:3000/graphql
 OAUTH2_ADMIN_PORT=4445
-OAUTH2_ADMIN_URL=http://hydra.auth.reaction.localhost:4445
+OAUTH2_ADMIN_URL=http://hydra.reaction.localhost:4445
 OAUTH2_AUTH_URL=http://localhost:4444/oauth2/auth
 OAUTH2_CLIENT_ID=example-storefront
 OAUTH2_CLIENT_SECRET=CHANGEME
 OAUTH2_PUBLIC_LOGOUT_URL=http://localhost:4444/oauth2/sessions/logout
-OAUTH2_HOST=hydra.auth.reaction.localhost
+OAUTH2_HOST=hydra.reaction.localhost
 OAUTH2_IDP_PUBLIC_CHANGE_PASSWORD_URL=http://localhost:4100/account/change-password?email=EMAIL&from=FROM
-OAUTH2_IDP_HOST_URL=http://identity.auth.reaction.localhost:4100
-OAUTH2_TOKEN_URL=http://hydra.auth.reaction.localhost:4444/oauth2/token
+OAUTH2_IDP_HOST_URL=http://identity.reaction.localhost:4100
+OAUTH2_TOKEN_URL=http://hydra.reaction.localhost:4444/oauth2/token
 PORT=4000
 SEGMENT_ANALYTICS_SKIP_MINIMIZE=true
 SEGMENT_ANALYTICS_WRITE_KEY=ENTER_KEY_HERE

README.md

@@ -188,8 +188,7 @@ docker build -t reaction-storefront .
 Then, to start the app on your machine, make sure the Reaction API container is already running and enter:
 
 ```sh
-docker run -it --name storefront -p 4000:4000 --env-file .env --network api.reaction.localhost reaction-storefront
-docker network connect auth.reaction.localhost storefront
+docker run -it --name storefront -p 4000:4000 --env-file .env --network reaction.localhost reaction-storefront
 ```
 
 _**NOTE:** You can replace the number before the colon in `4000:4000` with a different localhost port you'd like the application to run at._

docker-compose.yml

@@ -7,20 +7,17 @@
 version: '3.4'
 
 networks:
-  api:
+  reaction:
     external:
-      name: api.reaction.localhost
-  auth:
-    external:
-      name: auth.reaction.localhost
+      name: reaction.localhost
 
 services:
   web:
     image: reactioncommerce/example-storefront:release-v3.0.0
     env_file:
       - ./.env
     networks:
-      api:
-      auth:
+      default:
+      reaction:
     ports:
       - 4000:4000

package.json

@@ -23,7 +23,7 @@
     "test:unit": "NODE_ENV=jesttest jest",
     "test:unit:watch": "NODE_ENV=jesttest jest --watchAll",
     "test:integration": "mocha tests/integration",
-    "test:link": "blc http://web.api.reaction.localhost:4000 -ro -filter=3 -e",
+    "test:link": "blc http://web.reaction.localhost:4000 -ro -filter=3 -e",
     "test:file": "NODE_ENV=jesttest jest --watch --no-coverage"
   },
   "eslintConfig": {