From c3fcd3a0402d569558fecc58ef1451a483c2c17a Mon Sep 17 00:00:00 2001 From: Leo McArdle Date: Thu, 4 Mar 2021 11:57:02 +0000 Subject: [PATCH] move circleci docker volume workaround outside of Makefile (#4703) --- .circleci/config.yml | 5 +++++ Makefile | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6fe4fa724..defec9f4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,6 +19,11 @@ jobs: - run: name: Run mocha tests command: make test-js-ci + - run: + # copy synonym files to elasticsearch7 container, since circleci doesn't support volume mounts: + # https://circleci.com/docs/2.0/building-docker-images/#mounting-folders + name: Copy synonym files to elasticsearch7 + command: docker cp ./kitsune/search/dictionaries/synonyms/. project_elasticsearch7_1:/usr/share/elasticsearch/config/synonyms - run: name: Run unit tests command: make test-ci diff --git a/Makefile b/Makefile index 796e25229..7565b680b 100644 --- a/Makefile +++ b/Makefile @@ -127,9 +127,6 @@ build-ci: .docker-build-pull touch .docker-build-ci test-ci: .docker-build-ci - # copy synonym files to elasticsearch7 container, since circleci doesn't support volume mounts: - # https://circleci.com/docs/2.0/building-docker-images/#mounting-folders - docker cp ./kitsune/search/dictionaries/synonyms/. project_elasticsearch7_1:/usr/share/elasticsearch/config/synonyms ${DC_CI} run test-image test-js-ci: .docker-build-ci