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

chore: reconfigure docker-compose networks #653

Merged
merged 1 commit into from
Jan 31, 2020
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
10 changes: 5 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down
11 changes: 4 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down