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

Docker Proxy Config Updates #2275

Merged
merged 4 commits into from
Dec 19, 2017
Merged

Docker Proxy Config Updates #2275

merged 4 commits into from
Dec 19, 2017

Conversation

kducharm
Copy link
Member

@kducharm kducharm commented Dec 8, 2017

Updates to local Traefik proxy + fixing integration with Jenkins deployment server proxy.

If using docker native (not docker machine), Traefik proxy can be enabled prior to ahoy docker up by preceding with ahoy docker proxy-up. http://localhost:8080 will show the Traefik dashboard with the hostnames of running DKAN containers. https://dkan.localtest.me for example would be the resulting URL, attainable by running ahoy docker surl

QA Steps

Test Docker Machine

  • Test eval "$(ahoy docker env)"
  • Test ahoy docker surl
  • Test ahoy docker url
  • Test ahoy docker vnc
  • Test ahoy drush uli

Test Native Docker / Docker For Mac

  • Make sure docker machine variables environment are not set
  • Run export AHOY_CMD_PROXY=DOCKER
  • Run ahoy docker up
  • Test ahoy docker surl
  • Test ahoy docker url
  • Test ahoy docker vnc
  • Test ahoy drush uli

Test Native Docker + Proxy

  • Run ahoy docker proxy-up and ahoy docker up
  • Test ahoy docker surl
  • Test ahoy docker url
  • Test ahoy docker vnc
  • Test ahoy drush uli

Jenkins Demo

Multiple Installs

  • Check that two different installs can run simultaneously

Reminders

  • There is test for the issue.
  • CHANGELOG updated.
  • Coding standards checked.
  • Review docs.getdkan.com (or in /docs) to see if it still covers the scope of the PR and update if needed.

@dafeder dafeder merged commit c384cc9 into 7.x-1.x Dec 19, 2017
@dafeder dafeder deleted the docker-proxy-kd branch December 19, 2017 01:00
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* Updates for traefik proxy, docker compose v2 bridge networking

* Updated changelog
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* Updates for traefik proxy, docker compose v2 bridge networking

* Updated changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants