From 6483b077c3155b8e582c04b13da25c84ec24ddf8 Mon Sep 17 00:00:00 2001 From: acouch Date: Wed, 23 May 2018 14:23:42 -0400 Subject: [PATCH 1/5] Updates to our own container --- .ahoy/docker-compose.common.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.ahoy/docker-compose.common.yml b/.ahoy/docker-compose.common.yml index 609b563795..8e39d5e548 100644 --- a/.ahoy/docker-compose.common.yml +++ b/.ahoy/docker-compose.common.yml @@ -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: @@ -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: From 9488649509f206617bae27cbcd1d220165be1d9c Mon Sep 17 00:00:00 2001 From: acouch Date: Wed, 23 May 2018 15:30:25 -0400 Subject: [PATCH 2/5] Updates enabling xdebug --- .ahoy/.docker/etc/php5/php-cli.ini | 15 --------------- .ahoy/docker.ahoy.yml | 6 ++++-- .circleci/config.yml | 1 - 3 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 .ahoy/.docker/etc/php5/php-cli.ini diff --git a/.ahoy/.docker/etc/php5/php-cli.ini b/.ahoy/.docker/etc/php5/php-cli.ini deleted file mode 100644 index f97dd06d68..0000000000 --- a/.ahoy/.docker/etc/php5/php-cli.ini +++ /dev/null @@ -1,15 +0,0 @@ -; PHP CLI settings -[php] -; Maximum amount of memory a script may consume -memory_limit = 512M - -[xdebug] -xdebug_remote_handler=dbgp -xdebug.remote_port=9000 -xdebug.remote_log="/var/log/xdebug.log" -xdebug.idekey="PHPSTORM" -xdebug.show_local_vars=On -xdebug.var_display_max_data=10000 -xdebug.var_display_max_depth=20 -xdebug.max_nesting_level=200 -xdebug.extended_info=On diff --git a/.ahoy/docker.ahoy.yml b/.ahoy/docker.ahoy.yml index 000ace462a..5d303603bf 100644 --- a/.ahoy/docker.ahoy.yml +++ b/.ahoy/docker.ahoy.yml @@ -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 ;; diff --git a/.circleci/config.yml b/.circleci/config.yml index 7101d6eebc..6c77e14f13 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,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: | From ed37e7a7b31ef6e39b7394a8cf9e6a998c6ca59b Mon Sep 17 00:00:00 2001 From: acouch Date: Thu, 24 May 2018 13:00:11 -0400 Subject: [PATCH 3/5] Fixes artifacts --- .circleci/config.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c77e14f13..5a2755f42c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: | @@ -95,11 +98,8 @@ jobs: name: Install Test Libs command: | ahoy cd-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-{{ .Branch }} - paths: - - ~/.drush - - ~/.composer - save_cache: key: v1-dkan-test-vendor paths: @@ -109,6 +109,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: From ba681579a811ce935d506fae4284dff3dd2531bc Mon Sep 17 00:00:00 2001 From: acouch Date: Tue, 29 May 2018 16:16:30 -0400 Subject: [PATCH 4/5] Updates config --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5a2755f42c..93c5f3dcc3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -99,7 +99,6 @@ jobs: command: | ahoy cd-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: - save_cache: key: v1-dkan-test-vendor paths: From d090cbd2c415ebd4dcb575f8bd52fa3b130a2b47 Mon Sep 17 00:00:00 2001 From: Aaron Couch Date: Wed, 30 May 2018 09:37:32 -0400 Subject: [PATCH 5/5] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93c5f3dcc3..28dd7c31f5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -97,7 +97,7 @@ jobs: - run: name: Install Test Libs command: | - ahoy cd-proxy bash dkan/.ahoy/.scripts/composer-install.sh docroot/profiles/dkan/test + 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