From c1ad38cc18a63f4d4cdcac2db163b903a80e37b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Klocek?= Date: Tue, 7 Nov 2023 12:57:34 +0100 Subject: [PATCH] [docker-compose] Update deprecated localstack config Summary: Details in [[ https://linear.app/comm/issue/ENG-5677/commtest-ci-is-broken | ENG-5677 ]]. Some of the config environment variables for Localstack are deprecated. I've updated them according to [[ https://docs.localstack.cloud/references/configuration/ | the docs ]]. Depends on D9740 Test Plan: - Run localstack locally and use it (e.g. integration tests) - Stop and restart localstack container, check if the data is still there (DDB and S3 items) - Run this on CI Reviewers: kamil, michal, atul Reviewed By: atul Subscribers: ashoat, tomek, wyilio Differential Revision: https://phab.comm.dev/D9742 --- services/docker-compose.tests.yml | 3 +++ services/docker-compose.yml | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/docker-compose.tests.yml b/services/docker-compose.tests.yml index 19567cbdad..ca8d14736a 100644 --- a/services/docker-compose.tests.yml +++ b/services/docker-compose.tests.yml @@ -75,6 +75,9 @@ services: args: - generate_keypair=true + localstack: + environment: + - PERSISTENCE=0 rabbitmq: healthcheck: test: rabbitmq-diagnostics -q ping diff --git a/services/docker-compose.yml b/services/docker-compose.yml index 42ecbd953a..6f7ffe56c5 100644 --- a/services/docker-compose.yml +++ b/services/docker-compose.yml @@ -92,10 +92,10 @@ services: - '4566:4566' environment: - SERVICES=s3,dynamodb - - DATA_DIR=/tmp/localstack - - HOSTNAME_EXTERNAL=localstack + - LOCALSTACK_HOST=localstack:4566 + - PERSISTENCE=1 volumes: - - localstack:/tmp/localstack + - localstack:/var/lib/localstack # RabbitMQ rabbitmq: # This version matches AWS MQ version (set in Terraform)