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 Local Environment Updates #1955

Merged
merged 11 commits into from
Jul 12, 2017
Merged

Docker Local Environment Updates #1955

merged 11 commits into from
Jul 12, 2017

Conversation

kducharm
Copy link
Member

@kducharm kducharm commented Jun 19, 2017

  • Eliminated use of docker-machine, does not require virtualbox any longer and uses Docker installation direct from docker.com for Mac OS and Linux
  • Made proxy container start/stop/destroy as part of all containers, exposed ports, added /etc/hosts entry via scripts
  • Fixed issues with install regarding database params for Docker
  • Fixed uli in case of docker usage
  • Fixes ahoy dkan uli not working if https is enabled.

@kducharm kducharm requested a review from dafeder June 19, 2017 23:58
Copy link

@dkinzer dkinzer left a comment

Choose a reason for hiding this comment

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

  • This is breaking ahoy dkan uli for me on Capitan. Not sure why.
  • We need to use ports instead of expose in docker-compose.yml or use will not be able to go to web URL or interact with exposed ports from outside the containers.

@kducharm kducharm force-pushed the docker-updates-kd branch from 01f4e0d to 0b20422 Compare June 20, 2017 17:57
@@ -5,6 +5,18 @@ commands:
usage: Run drush via ahoy (helpful for abstraction)
cmd: ahoy cmd-proxy drush --root=docroot "{{args}}"

uli:
Copy link

Choose a reason for hiding this comment

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

We need to move this back to ahoy/dkan.ahoy.yml because dkan_starter uses it but dkan_starter has it's own ahoy.yml OR we need to duplicate this in dkan_starter's own .ahoy.yml file.

@dkinzer
Copy link

dkinzer commented Jul 12, 2017

Looks good. Merging. Holding off on docs merge because I think it's not accurate currently

@dkinzer dkinzer merged commit f68c4c3 into 7.x-1.x Jul 12, 2017
@dkinzer dkinzer deleted the docker-updates-kd branch July 12, 2017 14:18
dkinzer pushed a commit that referenced this pull request Jul 19, 2017
* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.

Backports #1955 into 1.13.5
dafeder pushed a commit that referenced this pull request Jul 20, 2017
* 1.13.5 release notes (#2009)

* 1.13.5 Release notes.

* Clean up CHANGELOG

* Couple more changleog corrections/

* Last minute fixes

* Add custom filelds and test tags.

* Allow skipping of some tests.
* Add custom fields.

* Reconcile PR1943 with the 1.13.5 release

* Remove changes on user.admin.feature

* code review on .ht.router.php

* Fix user.admin.feature

* Add BeforeSuite file shiv.

REF CIVIC-6610

When stage file proxy is enabled we need to make sure some required files are present in public://
By adding a BeforeSuite step that copies these files from a site to the local
environment, we fix errors that arise from files not being present in the
testing environment.

* Docker Local Environment Updates (#1955)

* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.

Backports #1955 into 1.13.5

* Remove CHANGELOG updates.

* Remove CHANGELOG changes.

* Revert "Remove CHANGELOG changes."

This reverts commit 108d7c2.

* Revert "Remove CHANGELOG updates."

This reverts commit 3b02c2a.

* Release notes for 1.13.6
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* 1.13.5 release notes (#2009)

* 1.13.5 Release notes.

* Clean up CHANGELOG

* Couple more changleog corrections/

* Last minute fixes

* Add custom filelds and test tags.

* Allow skipping of some tests.
* Add custom fields.

* Reconcile PR1943 with the 1.13.5 release

* Remove changes on user.admin.feature

* code review on .ht.router.php

* Fix user.admin.feature

* Add BeforeSuite file shiv.

REF CIVIC-6610

When stage file proxy is enabled we need to make sure some required files are present in public://
By adding a BeforeSuite step that copies these files from a site to the local
environment, we fix errors that arise from files not being present in the
testing environment.

* Docker Local Environment Updates (#1955)

* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.

Backports #1955 into 1.13.5

* Remove CHANGELOG updates.

* Remove CHANGELOG changes.

* Revert "Remove CHANGELOG changes."

This reverts commit 86c0888.

* Revert "Remove CHANGELOG updates."

This reverts commit 1297144.

* Release notes for 1.13.6
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.
dafeder pushed a commit that referenced this pull request Apr 24, 2020
* 1.13.5 release notes (#2009)

* 1.13.5 Release notes.

* Clean up CHANGELOG

* Couple more changleog corrections/

* Last minute fixes

* Add custom filelds and test tags.

* Allow skipping of some tests.
* Add custom fields.

* Reconcile PR1943 with the 1.13.5 release

* Remove changes on user.admin.feature

* code review on .ht.router.php

* Fix user.admin.feature

* Add BeforeSuite file shiv.

REF CIVIC-6610

When stage file proxy is enabled we need to make sure some required files are present in public://
By adding a BeforeSuite step that copies these files from a site to the local
environment, we fix errors that arise from files not being present in the
testing environment.

* Docker Local Environment Updates (#1955)

* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.

Backports #1955 into 1.13.5

* Remove CHANGELOG updates.

* Remove CHANGELOG changes.

* Revert "Remove CHANGELOG changes."

This reverts commit 86c0888.

* Revert "Remove CHANGELOG updates."

This reverts commit 1297144.

* Release notes for 1.13.6
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.

2 participants