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.

Sign up for GitHub

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

Jump to bottom

Styx docker environment: add NGINX origins #499

Merged
merged 2 commits into from
Oct 24, 2019
Merged

Styx docker environment: add NGINX origins #499

merged 2 commits into from
Oct 24, 2019

Conversation

mikkokar
Copy link
Contributor

Replaces Apache httpd with NGINX based origins.

dvlato
dvlato approved these changes Oct 23, 2019
View reviewed changes
Copy link
Contributor

@dvlato dvlato left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved but would appreciate some clean up regarding the public+private key.

system-tests/docker-test-env/docker-compose.yml
@@ -34,9 +35,6 @@ services:
volumes:
- ./styx-config:/styx/config
- ./styx-logs:/styx/logs
links:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

About time :)

system-tests/docker-test-env/docker-compose.yml Show resolved Hide resolved
system-tests/docker-test-env/nginx/testCredentials.crt Show resolved Hide resolved
@mikkokar mikkokar merged commit 70a89e4 into ExpediaGroup:master Oct 24, 2019
@mikkokar mikkokar deleted the docker-nginx-origins branch October 24, 2019 12:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dvlato dvlato dvlato approved these changes

@chrisgresty chrisgresty Awaiting requested review from chrisgresty

@OwenLindsell OwenLindsell Awaiting requested review from OwenLindsell

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mikkokar @dvlato