From 476f49876161afa2f771fe831636d4ad544b6d7d Mon Sep 17 00:00:00 2001 From: Joshua Powers Date: Thu, 2 Jun 2022 11:33:41 -0600 Subject: [PATCH] test: remove docker-compose.yml test file (#11243) --- CONTRIBUTING.md | 9 --------- Makefile | 5 ----- docker-compose.yml | 35 ----------------------------------- 3 files changed, 49 deletions(-) delete mode 100644 docker-compose.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77a28b82130c7..38fde7c536a34 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -80,13 +80,6 @@ make test (Optional) -Running the integration tests requires several docker containers to be -running. You can start the containers with: - -```shell -docker-compose up -``` - To run only the integration tests use: ```shell @@ -99,8 +92,6 @@ To run the full test suite use: make test-all ``` -Use `make docker-kill` to stop the containers. - ### For more developer resources - [Code Style][codestyle] diff --git a/Makefile b/Makefile index dca265d1fbb54..fea1417158abc 100644 --- a/Makefile +++ b/Makefile @@ -235,11 +235,6 @@ docker-image: plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl ragel -Z -G2 $^ -o $@ -.PHONY: plugin-% -plugin-%: - @echo "Starting dev environment for $${$(@)} input plugin..." - @docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up - .PHONY: ci ci: docker build -t quay.io/influxdb/telegraf-ci:1.18.1 - < scripts/ci.docker diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 38c27e56d1dfc..0000000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,35 +0,0 @@ -version: '3' - -services: - zookeeper: - image: wurstmeister/zookeeper - environment: - - JAVA_OPTS="-Xms256m -Xmx256m" - ports: - - "2181:2181" - kafka: - image: wurstmeister/kafka - environment: - - KAFKA_ADVERTISED_HOST_NAME=localhost - - KAFKA_ADVERTISED_PORT=9092 - - KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181 - - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1 - - JAVA_OPTS="-Xms256m -Xmx256m" - ports: - - "9092:9092" - depends_on: - - zookeeper - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.8.23 - environment: - - "ES_JAVA_OPTS=-Xms256m -Xmx256m" - - discovery.type=single-node - - xpack.security.enabled=false - ports: - - "9200:9200" - postgres: - image: postgres:alpine - environment: - - POSTGRES_HOST_AUTH_METHOD=trust - ports: - - "5432:5432"