diff --git a/deploy/docker-compose-new/deploy.sh b/deploy/docker-compose-new/deploy.sh index 4b8f7e3..f9eb6a4 100755 --- a/deploy/docker-compose-new/deploy.sh +++ b/deploy/docker-compose-new/deploy.sh @@ -3,12 +3,12 @@ DIR=$( cd "$(dirname "$0")" || exit; pwd -P ) ROOT_DIR=$DIR/../../ -pushd "$ROOT_DIR" || exit -# echo "Building Simulator..." -# if [[ "$(docker images -q xmidt/simulator:latest 2> /dev/null)" == "" ]]; then -# docker build -t xmidt/simulator:latest $ROOT_DIR/simulator -# fi -popd +# pushd "$ROOT_DIR" || exit +# # echo "Building Simulator..." +# # if [[ "$(docker images -q xmidt/simulator:latest 2> /dev/null)" == "" ]]; then +# # docker build -t xmidt/simulator:latest $ROOT_DIR/simulator +# # fi +# popd echo "Running services..." CONSUL_VERSION=${CONSUL_VERSION:-1.12.6} \ diff --git a/deploy/docker-compose-new/docker-compose.yml b/deploy/docker-compose-new/docker-compose.yml index 78f97b8..c46e4eb 100644 --- a/deploy/docker-compose-new/docker-compose.yml +++ b/deploy/docker-compose-new/docker-compose.yml @@ -62,17 +62,22 @@ services: container_name: dynamo-xmidt hostname: dynamodb image: amazon/dynamodb-local + environment: + AWS_ACCESS_KEY_ID: accessKey + AWS_SECRET_ACCESS_KEY: secretKey + AWS_REGION: local + command: -jar DynamoDBLocal.jar -inMemory -sharedDb -port 4566 networks: - xmidt ports: - "4566:4566" healthcheck: - test: + test: ["CMD-SHELL",'if [ "$(curl -s -o /dev/null -I -w ''%{http_code}'' http://localhost:4566)" == "400" ]; then exit 0; else exit 1; fi',] - interval: 5s - timeout: 30s - retries: 3 - start_period: 5s + interval: 5s + timeout: 30s + retries: 3 + start_period: 5s petasos: container_name: petasos depends_on: @@ -222,4 +227,3 @@ services: - xmidt ports: - "9411:9411" -version: "3.8"