diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index aaf0e873..2ec324de 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,14 +5,11 @@ "workspaceFolder": "/workspace", "shutdownAction": "stopCompose", "features": { - "ghcr.io/devcontainers-contrib/features/rabbitmq-asdf:1": { - "version": "latest", - "erlangVersion": "latest" - }, - "ghcr.io/devcontainers-contrib/features/vault-asdf:2": { - "version": "latest" - } + "ghcr.io/devcontainers-contrib/features/rabbitmq-asdf:1": {}, + "ghcr.io/devcontainers-contrib/features/vault-asdf:2": {}, + "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, "forwardPorts": [4369, 5672, 6379, 8000], - "postCreateCommand": "docker-compose up -d" + "postCreateCommand": "docker-compose up -d", + "runServices": ["redis", "celery", "rabbitmq", "vault"] } diff --git a/.devcontainer/Dockerfile b/Dockerfile similarity index 100% rename from .devcontainer/Dockerfile rename to Dockerfile diff --git a/chirps/base_app/management/commands/redis.py b/chirps/base_app/management/commands/redis.py index cf9868be..5f5c3bd6 100644 --- a/chirps/base_app/management/commands/redis.py +++ b/chirps/base_app/management/commands/redis.py @@ -23,35 +23,3 @@ def handle(self, *args, **options): os.system('docker-compose -f /workspace/.devcontainer/docker-compose.yml down') elif options['status']: os.system('docker-compose -f /workspace/.devcontainer/docker-compose.yml ps') - - -# """Management command for interacting with redis.""" -# import os - -# from django.core.management.base import BaseCommand - - -# class Command(BaseCommand): -# """Management command for interacting with redis.""" - -# help = 'Interact with the local redis development server' - -# def add_arguments(self, parser): -# """Add arguments to redis command""" -# parser.add_argument('--start', action='store_true', help='Start redis server') -# parser.add_argument('--stop', action='store_true', help='Stop redis server') -# parser.add_argument('--status', action='store_true', help='Check redis server status') - -# def handle(self, *args, **options): -# """Handle redis command""" -# docker_compose_path = shutil.which("docker-compose") -# if not docker_compose_path: -# self.stdout.write(self.style.ERROR("docker-compose not found. Please ensure it is installed.")) -# return - -# if options['start']: -# os.system(f'{docker_compose_path} -f /workspace/.devcontainer/docker-compose.yml up -d redis') -# elif options['stop']: -# os.system(f'{docker_compose_path} -f /workspace/.devcontainer/docker-compose.yml down') -# elif options['status']: -# os.system(f'{docker_compose_path} -f /workspace/.devcontainer/docker-compose.yml ps')