Skip to content

Commit

Permalink
build: update docker-compose to docker compose on CI and other places (
Browse files Browse the repository at this point in the history
  • Loading branch information
DawoudSheraz authored Apr 3, 2024
1 parent 164a6f5 commit 5dd3d8c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .ci/docker.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ci_up: ## Create containers used to run tests on CI
docker-compose -f .ci/docker-compose-ci.yml up -d
docker compose -f .ci/docker-compose-ci.yml up -d
.PHONY: ci_up

ci_start: ## Start containers stopped by `ci_stop`
docker-compose -f .ci/docker-compose-ci.yml start
docker compose -f .ci/docker-compose-ci.yml start
.PHONY: ci_start

ci_test: ## Run tests on Docker containers, as on CI
Expand All @@ -24,9 +24,9 @@ ci_semgrep:
.PHONY: ci_semgrep

ci_stop: ## Stop running containers created by `ci_up` without removing them
docker-compose -f .ci/docker-compose-ci.yml stop
docker compose -f .ci/docker-compose-ci.yml stop
.PHONY: ci_stop

ci_down: ## Stop and remove containers and other resources created by `ci_up`
docker-compose -f .ci/docker-compose-ci.yml down
docker compose -f .ci/docker-compose-ci.yml down
.PHONY: ci_down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ push_translations: ## Push source translation files (.po) to Transifex
tx push -s

start-devstack: ## Run a local development copy of the server
docker-compose up
docker compose up

stop-devstack: ## Shutdown the local development server
docker-compose down
docker compose down

open-devstack: ## Open a shell on the server started by start-devstack
docker-compose up -d
docker compose up -d
docker exec -it course-discovery env TERM=$(TERM) /edx/app/discovery/devstack.sh open

accept: ## Run acceptance tests
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@ This will install some dependencies in addition to running all tests. After the

.. code-block:: bash
$ docker-compose -f .ci/docker-compose-ci.yml exec discovery bash -c 'cd /edx/app/discovery/discovery && .tox/py38-django22/bin/pytest course_discovery/apps/api/v1/tests/test_views/test_programs.py'
$ docker compose -f .ci/docker-compose-ci.yml exec discovery bash -c 'cd /edx/app/discovery/discovery && .tox/py38-django22/bin/pytest course_discovery/apps/api/v1/tests/test_views/test_programs.py'
When you're done, take down the services you brought up with ``make ci_down``.

0 comments on commit 5dd3d8c

Please sign in to comment.