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

Share MySQL credentials with Docker Containers #2283

Merged
merged 3 commits into from
Dec 19, 2017
Merged

Share MySQL credentials with Docker Containers #2283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7624e85
Moved MySQL docker credentials to file for access by web/cli containers
kducharm Dec 14, 2017
abc96bf
Updated Changelog.txt
kducharm Dec 14, 2017
cc82047
Merge branch '7.x-1.x' into mysql-docker-env-kd
dafeder Dec 19, 2017
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
12 changes: 7 additions & 5 deletions .ahoy/docker-compose.common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ services:
- "./.docker/etc/php5/php.ini:/etc/php5/fpm/conf.d/z_php.ini"
- "./.docker/etc/php5/xdebug-linux.ini:/etc/php5/xdebug-linux.ini"
- "./.docker/etc/php5/xdebug-macos.ini:/etc/php5/xdebug-macos.ini"
env_file:
- mysql.env

# DB node
db:
hostname: db
image: blinkreaction/mysql:5.5
ports:
- "3306"
environment:
- MYSQL_ROOT_PASSWORD=admin123
- MYSQL_USER=drupal
- MYSQL_PASSWORD=123
- MYSQL_DATABASE=drupal
# MYSQL Credentials in mysql.env
env_file:
- mysql.env
volumes:
# MySQL configuration overrides
- "./.docker/etc/mysql/my.cnf:/etc/mysql/conf.d/z_my.cnf"
Expand All @@ -45,6 +45,8 @@ services:
image: nuams/drupal-cli:2016-10-16
environment:
- XDEBUG_CONFIG=idekey=PHPSTORM
env_file:
- mysql.env
links:
- db
- web
Expand Down
4 changes: 4 additions & 0 deletions .ahoy/mysql.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MYSQL_ROOT_PASSWORD=admin123
MYSQL_USER=drupal
MYSQL_PASSWORD=123
MYSQL_DATABASE=drupal
1 change: 1 addition & 0 deletions CHANGELOG.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- #2103 Fixed field mapping defaults for open data schema APIs
- #2237 Migration of CircleCI from V1 to V2
- #2273 Remove dkan_workflow_permissions dependency
- #2283 Share MySQL Credentials With Docker Containers

7.x-1.14
--------
Expand Down