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 #194

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
6 changes: 3 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
METEOR_DISABLE_OPTIMISTIC_CACHING=1
METEOR_WATCH_POLLING_INTERVAL_MS=10000
MONGO_OPLOG_URL=mongodb://mongo:27017/local
MONGO_URL=mongodb://mongo:27017/reaction
MONGO_OPLOG_URL=mongodb://mongo.reaction.localhost:27017/local
MONGO_URL=mongodb://mongo.reaction.localhost:27017/reaction
PORT=4080
OAUTH2_ADMIN_URL=http://hydra.auth.reaction.localhost:4445
OAUTH2_ADMIN_URL=http://hydra.reaction.localhost:4445
OAUTH2_IDP_PUBLIC_CHANGE_PASSWORD_URL=http://localhost:4100/account/change-password?email=EMAIL&from=FROM
OAUTH2_PUBLIC_URL=http://localhost:4444
PUBLIC_GRAPHQL_API_URL_HTTP=http://localhost:3000/graphql
Expand Down
13 changes: 1 addition & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,18 @@
version: '3.4'

networks:
api:
external:
name: api.reaction.localhost
auth:
external:
name: auth.reaction.localhost
reaction:
external:
name: reaction.localhost
streams:
external:
name: streams.reaction.localhost

services:
reaction-admin:
image: reactioncommerce/admin:trunk
env_file:
- ./.env
networks:
api:
auth:
default:
reaction:
streams:
ports:
- "4080:4080"
- "9231:9229"
2 changes: 1 addition & 1 deletion imports/plugins/core/core/server/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { num, str } = envalid;
export default envalid.cleanEnv(process.env, {
OAUTH2_ADMIN_URL: str({
desc: "An OAuth2 OpenID Connect compliant URL",
example: "http://hydra.auth.reaction.localhost:4445"
example: "http://hydra.reaction.localhost:4445"
}),
OAUTH2_CLIENT_ID: str({
default: "reaction-admin",
Expand Down