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

Updates docker-compose to use updated cli container #2533

Merged
merged 5 commits into from
Jun 5, 2018
Merged

Updates docker-compose to use updated cli container #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6483b07
Updates to our own container
acouch May 23, 2018
9488649
Updates enabling xdebug
acouch May 23, 2018
ed37e7a
Fixes artifacts
acouch May 24, 2018
ba68157
Updates config
acouch May 29, 2018
d090cbd
Update config.yml
acouch May 30, 2018
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
15 changes: 0 additions & 15 deletions .ahoy/.docker/etc/php5/php-cli.ini
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions .ahoy/docker-compose.common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
# Used for all console commands and tools.
cli:
hostname: cli
image: nuams/drupal-cli:2016-10-16
image: getdkan/dkan-docker:php5-cli
environment:
- XDEBUG_CONFIG=idekey=PHPSTORM
env_file:
Expand All @@ -66,10 +66,6 @@ services:
ports:
- "8888"
volumes:
# PHP configuration overrides
- "./.docker/etc/php5/php-cli.ini:/etc/php5/cli/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"
# Host SSH keys mapping. Uncomment one of the lines below based on your setup.
- ~/.ssh:/.ssh
labels:
Expand Down
6 changes: 4 additions & 2 deletions .ahoy/docker.ahoy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,15 @@ commands:
case $args in
start)
ahoy docker exec web cp -f ${XDEBUG_FILE} /etc/php5/mods-available/xdebug.ini
ahoy docker exec cli cp -f ${XDEBUG_FILE} /etc/php5/mods-available/xdebug.ini
ahoy docker exec cli phpenmod xdebug
ahoy docker exec cli cp -f ${XDEBUG_FILE} /etc/php/5.6/cli/conf.d/${XDEBUG_FILE}
ahoy docker compose restart web
ahoy docker compose restart cli
;;
stop)
ahoy docker exec web rm -f /etc/php5/mods-available/xdebug.ini
ahoy docker exec cli rm -f /etc/php5/mods-available/xdebug.ini
ahoy docker exec cli phpdismod xdebug
ahoy docker exec cli rm -f /etc/php5/mods-available/${XDEBUG_FILE}
ahoy docker compose restart web
ahoy docker compose restart cli
;;
Expand Down
13 changes: 6 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ jobs:
name: Setup DKAN
command: |
bash dkan-init.sh dkan --deps
- restore_cache:
keys:
- v1-dkan-test-vendor
- run:
name: Start containers
command: |
Expand All @@ -71,7 +74,6 @@ jobs:
docker cp .ahoy.yml $(docker-compose ps -q cli):/var/www
mkdir -p dkan/test/assets/junit
docker cp dkan $(docker-compose ps -q cli):/var/www
ahoy docker xdebug stop
- run:
name: Install Drupal
command: |
Expand All @@ -95,12 +97,8 @@ jobs:
- run:
name: Install Test Libs
command: |
ahoy cd-proxy bash dkan/.ahoy/.scripts/composer-install.sh docroot/profiles/dkan/test
- save_cache:
key: v1-dkan-{{ .Branch }}
paths:
- ~/.drush
- ~/.composer
ahoy cmd-proxy bash dkan/.ahoy/.scripts/composer-install.sh docroot/profiles/dkan/test
docker cp $(docker-compose ps -q cli):/var/www/dkan/test/vendor dkan/test/vendor
- save_cache:
key: v1-dkan-test-vendor
paths:
Expand All @@ -110,6 +108,7 @@ jobs:
command: ruby dkan/.ahoy/.scripts/circle-behat.rb docroot/profiles/dkan/test/features
- run:
name: Copy Assets to Base Image
when: on_fail
command: |
docker cp $(docker-compose ps -q cli):/var/www/dkan/test/assets assets
- run:
Expand Down