Skip to content

Commit

Permalink
Actualize docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
yalef committed Nov 15, 2023
1 parent 498d410 commit 1391c58
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: '3.7'

services:
redis:
Expand Down
14 changes: 1 addition & 13 deletions provision/ci.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
##############################################################################
from invoke import task

from . import common, django, docker, linters, project, tests
from . import common, docker, project


@task
Expand All @@ -20,15 +20,3 @@ def set_up_hosts(context):
common.success("Setting up hosts")
context.run("echo \"127.0.0.1 postgres\" | sudo tee -a /etc/hosts")
context.run("echo \"127.0.0.1 redis\" | sudo tee -a /etc/hosts")


@task
def start(context, check):
"""Perform ci check"""
common.success("Perform CI check")
checks_map = dict(
style=linters.all,
migrations=django.check_new_migrations,
tests=tests.run_ci,
)
checks_map[check](context)
10 changes: 5 additions & 5 deletions provision/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def up_containers(
else:
common.success("Bring up all containers")
up_cmd = (
f"docker-compose up "
f"docker compose up "
f"{'-d ' if detach else ''}"
f"{' '.join(containers)}"
)
Expand All @@ -61,7 +61,7 @@ def up_containers(
def stop_containers(context, containers):
"""Stop containers."""
common.success(f"Stopping {' '.join(containers)} containers ")
cmd = f"docker-compose stop {' '.join(containers)}"
cmd = f"docker compose stop {' '.join(containers)}"
context.run(cmd)


Expand Down Expand Up @@ -89,6 +89,6 @@ def clear(context):
"""Stop and remove all containers defined in docker-compose.
Also remove images.
"""
common.success("Clearing docker-compose")
context.run("docker-compose rm -f")
context.run("docker-compose down -v --rmi all --remove-orphans")
common.success("Clearing docker compose")
context.run("docker compose rm -f")
context.run("docker compose down -v --rmi all --remove-orphans")
3 changes: 3 additions & 0 deletions requirements/local_build.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@ pre-commit
# Gitlint is a git commit message linter written in python: it checks your commit messages for style.
# https://jorisroovers.com/gitlint/
gitlint
# TODO: Remove when issue will be resolved:
# https://github.com/jorisroovers/gitlint/issues/535
virtualenv==20.24.5

0 comments on commit 1391c58

Please sign in to comment.