From c6ae060d28fd654007ddfa7df4488a4a77288637 Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Fri, 11 May 2018 13:16:36 -0700 Subject: [PATCH] include circle ci env vars in docker env --- .circleci/config.yml | 1 + config/docker/compose.yml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0da3b37b8..2cf38ebbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,7 @@ jobs: name: Run tests command: | docker-compose -f config/docker/compose.yml exec web bash -c 'curl -o /tmp/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci && chmod +x /tmp/circleci' + docker-compose -f config/docker/compose.yml exec web bash -c '/tmp/circleci tests glob "test/**/*_test.rb" | /tmp/circleci tests split | xargs echo' docker-compose -f config/docker/compose.yml exec web bash -c '/tmp/circleci tests glob "test/**/*_test.rb" | /tmp/circleci tests split | xargs bin/rails test' - store_test_results: path: test/reports diff --git a/config/docker/compose.yml b/config/docker/compose.yml index 1d8e70b10..6bd23d7f0 100644 --- a/config/docker/compose.yml +++ b/config/docker/compose.yml @@ -49,6 +49,9 @@ services: - DANBOORU_NICO_SEIGA_LOGIN - DANBOORU_NICO_SEIGA_PASSWORD - DANBOORU_PERSIST_PIXIV_SESSION + - CIRCLE_NODE_TOTAL + - CIRCLE_NODE_INDEX + - CIRCLE_BUILD_IMAGE build: context: ../.. dockerfile: config/docker/danbooru-ci