From a1265156181b1dac251fe3b22245214b08316cf0 Mon Sep 17 00:00:00 2001 From: Alex Nork <48630278+alex-nork@users.noreply.github.com> Date: Wed, 12 Jul 2023 20:14:53 +0000 Subject: [PATCH] run pre-commit hooks --- .devcontainer/devcontainer.json | 31 ++++++------- .devcontainer/docker-compose.yml | 48 ++++++++++---------- chirps/base_app/management/commands/redis.py | 17 ++++--- 3 files changed, 47 insertions(+), 49 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ef3f41ad..35e3cf20 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,18 +1,17 @@ -{ - "name": "Python 3", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "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" - } +{ + "name": "Python 3", + "dockerComposeFile": "docker-compose.yml", + "service": "app", + "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" + } }, "postCreateCommand": "sudo curl -L 'https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)' -o /usr/local/bin/docker-compose && sudo chmod +x /usr/local/bin/docker-compose" -// "remoteUser": "vscode" -} +} diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 8002eff5..b0dccf07 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,24 +1,24 @@ -version: '3.8' - -services: - app: - image: mcr.microsoft.com/devcontainers/python:0-3.11 - volumes: - - ..:/workspace:cached - command: sleep infinity - networks: - default: - aliases: - - localhost - - redis: - image: redis/redis-stack:latest - ports: - - 6379:6379 - networks: - default: - aliases: - - localhost - -networks: - default: +version: '3.8' + +services: + app: + image: mcr.microsoft.com/devcontainers/python:0-3.11 + volumes: + - ..:/workspace:cached + command: sleep infinity + networks: + default: + aliases: + - localhost + + redis: + image: redis/redis-stack:latest + ports: + - 6379:6379 + networks: + default: + aliases: + - localhost + +networks: + default: diff --git a/chirps/base_app/management/commands/redis.py b/chirps/base_app/management/commands/redis.py index 81ab6d02..5f5c3bd6 100644 --- a/chirps/base_app/management/commands/redis.py +++ b/chirps/base_app/management/commands/redis.py @@ -15,12 +15,11 @@ def add_arguments(self, parser): 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""" - if options['start']: - os.system('docker-compose -f /workspace/.devcontainer/docker-compose.yml up -d redis') - elif options['stop']: - 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') - + def handle(self, *args, **options): + """Handle redis command""" + if options['start']: + os.system('docker-compose -f /workspace/.devcontainer/docker-compose.yml up -d redis') + elif options['stop']: + 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')