diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f9abca61..c65955dcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -102,13 +102,9 @@ jobs: docker stop dapr_placement cd dapr ./dist/linux_amd64/release/placement & - - name: Install local Kafka using docker-compose + - name: Spin local environment run: | - docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml up -d - docker ps - - name: Install local Mongo database using docker-compose - run: | - docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d + docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka docker ps - name: Install local ToxiProxy to simulate connectivity issues to Dapr sidecar run: | diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 090445ebd..13a7ce3fb 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -102,7 +102,7 @@ jobs: pip3 install mechanical-markdown - name: Install Local mongo database using docker-compose run: | - docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d + docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo docker ps - name: Clean up files run: mvn clean diff --git a/README.md b/README.md index 1fe922997..64aaada61 100644 --- a/README.md +++ b/README.md @@ -241,17 +241,13 @@ Similarly, all of these need to be run for running the ITs either individually o Run the following commands from the root of the repo to start all the docker containers that the tests depend on. ```bash -docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml up -d -docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d -docker-compose -f ./sdk-tests/deploy/local-test-vault.yml up -d +docker-compose -f ./sdk-tests/deploy/local-test.yml up -d ``` To stop the containers and services, run the following commands. ```bash -docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml down -docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml down -docker-compose -f ./sdk-tests/deploy/local-test-vault.yml down +docker-compose -f ./sdk-tests/deploy/local-test.yml down ``` diff --git a/sdk-tests/deploy/local-test-mongo.yml b/sdk-tests/deploy/local-test-mongo.yml deleted file mode 100644 index 54e211f1e..000000000 --- a/sdk-tests/deploy/local-test-mongo.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '2' -services: - mongo: - image: mongo - ports: - - "27017:27017" \ No newline at end of file diff --git a/sdk-tests/deploy/local-test-kafka.yml b/sdk-tests/deploy/local-test.yml similarity index 63% rename from sdk-tests/deploy/local-test-kafka.yml rename to sdk-tests/deploy/local-test.yml index bef5b6136..d4818cf11 100644 --- a/sdk-tests/deploy/local-test-kafka.yml +++ b/sdk-tests/deploy/local-test.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: zookeeper: image: wurstmeister/zookeeper:latest @@ -13,4 +13,12 @@ services: environment: KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1 KAFKA_CREATE_TOPICS: "sample:1:1" - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 \ No newline at end of file + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + mongo: + image: mongo + ports: + - "27017:27017" + redis: + image: redis + ports: + - "6379:6379"