From 0fec371b4ae38976b2b6b1c00a2a8d1073ea9526 Mon Sep 17 00:00:00 2001 From: helllllllder Date: Wed, 26 Jul 2023 17:08:04 -0300 Subject: [PATCH] feat: remove apm from docker compose --- chats/settings.py | 5 ---- docker/docker-compose.yml | 52 +-------------------------------------- makefile | 2 +- 3 files changed, 2 insertions(+), 57 deletions(-) diff --git a/chats/settings.py b/chats/settings.py index f4c18996..e8571da5 100644 --- a/chats/settings.py +++ b/chats/settings.py @@ -109,11 +109,6 @@ ASGI_APPLICATION = "chats.asgi.application" -# Database -# https://docs.djangoproject.com/en/4.0/ref/settings/#databases - -DATABASES = dict(default=env.db(var="DATABASE_URL")) - REDIS_URL = env.str("CHANNEL_LAYERS_REDIS", default="redis://localhost:6379/1") # channels diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index adbb35e7..8e47a37a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -55,60 +55,10 @@ services: - postgres - redis - apm-server: - image: docker.elastic.co/apm/apm-server:7.14.1 - depends_on: - - elasticsearch - - kibana - cap_add: [ "CHOWN", "DAC_OVERRIDE", "SETGID", "SETUID" ] - cap_drop: [ "ALL" ] - ports: - - 8200:8200 - networks: - - elastic - command: > - apm-server -e - -E apm-server.rum.enabled=true - -E setup.kibana.host=kibana:5601 - -E setup.template.settings.index.number_of_replicas=0 - -E apm-server.kibana.enabled=true - -E apm-server.kibana.host=kibana:5601 - -E output.elasticsearch.hosts=["elasticsearch:9200"] - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.14.1 - environment: - - discovery.type=single-node - - bootstrap.memory_lock=true - - "ES_JAVA_OPTS=-Xms128m -Xmx2g" - ulimits: - memlock: - hard: -1 - soft: -1 - ports: - - 9200:9200 - networks: - - elastic - - kibana: - image: docker.elastic.co/kibana/kibana:7.14.1 - depends_on: - - elasticsearch - environment: - ELASTICSEARCH_URL: http://elasticsearch:9200 - ELASTICSEARCH_HOSTS: http://elasticsearch:9200 - ports: - - 5601:5601 - networks: - - elastic - volumes: postgres: - esdata: - driver: local + networks: chats: external: true - elastic: - driver: bridge diff --git a/makefile b/makefile index 809060df..9ba5ae17 100644 --- a/makefile +++ b/makefile @@ -30,7 +30,7 @@ lint: ## Docker dev_up: - @docker-compose -f docker/docker-compose.yml up -d postgres redis elasticsearch kibana apm-server + @docker-compose -f docker/docker-compose.yml up -d postgres redis dev_down: @docker-compose -f docker/docker-compose.yml down