100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Update AWS templates for MVP
Michal Rutkaa1056fd08f49
diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.ymlindex fcc99e0ed..8cf80b614 100644--- a/mvp/aws-cloudformation.template.yml+++ b/mvp/aws-cloudformation.template.yml@@ -147,6 +147,36 @@ Resources:echo EMAIL_PASSWORD=$(or configure_aws --secret ${AccessKeys.SecretAccessKey} --quiet) >> access.txtecho EMAIL_USER=$EMAIL_USER >> access.txtecho EMAIL_HOST=$EMAIL_HOST >> access.txt+ mkdir ${HostName}+ cd ${HostName}+ cat <<EOF >fetch_s3_deploy.sh+ DEPLOYMENT=${1:?usage $0 DEPLOYMENT_NAME}+ AWS_ECR_REPO=$(docker run --rm -v ~/.aws:/root/.aws -v /var/run/docker.sock:/var/run/docker.sock --entrypoint aws openremote/openremote-cli ecr describe-repositories --repository-names $DEPLOYMENT --query 'repositories[0].repositoryUri' --profile openremote-cli | xargs echo)+ DOCKER_PASSWORD=$(docker run --rm -v ~/.aws:/root/.aws -v /var/run/docker.sock:/var/run/docker.sock --entrypoint aws openremote/openremote-cli ecr get-login-password --profile openremote-cli)+ docker login --username AWS --password $DOCKER_PASSWORD $AWS_ECR_REPO+ docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT openremote/openremote-cli map -f $DEPLOYMENT+ echo $AWS_ECR_REPO+ ./deploy.sh down+ docker images --filter "reference=$AWS_ECR_REPO" -q | xargs docker rmi+ sudo rm -rf deployment+ docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT openremote/openremote-cli map -a download -f $DEPLOYMENT/mapdata.mbtiles -v -t+ docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT openremote/openremote-cli map -a download -f $DEPLOYMENT/deployment.tar.gz -v -t+ sudo chown -R ubuntu:ubuntu .+ sudo tar -xf deployment.tar.gz+ sudo mv mapdata.mbtiles deployment/map/+ ./deploy.sh up -d+ docker images --filter "reference=openremote/openremote-cli" -q | xargs docker rmi+ EOF+ chmod +x fetch_s3_deploy.sh+ cat <<EOF >deploy.sh+ export EMAIL_USER=$EMAIL_USER+ export EMAIL_PASSWORD=$EMAIL_PASSWORD+ export EMAIL_HOST=email-smtp.eu-west-1.amazonaws.com+ export EMAIL_PORT=587+ PASSWORD=$PASSWORD DEPLOYMENT_NAME=${HostName} docker-compose $@+ EOF+ chmod +x deploy.sh+InstanceSecurityGroup:Type: AWS::EC2::SecurityGroupProperties:diff --git a/mvp/mvp-docker-compose.yml b/mvp/mvp-docker-compose.ymlindex 3b7f829a6..5c7a2c1ee 100644--- a/mvp/mvp-docker-compose.yml+++ b/mvp/mvp-docker-compose.yml@@ -28,7 +28,7 @@ volumes:services:proxy:- image: openremote/proxy:${DATE_TAG:-latest}+ image: openremote/proxy:${PROXY_VERSION:-2.1.2.1}networks:- public- private@@ -60,7 +60,7 @@ services:LE_EMAIL: admin@${DOMAINNAME}manager:- image: openremote/manager:${DATE_TAG:-latest}+ image: openremote/manager:${MANAGER_VERSION:-latest}networks:- privatedepends_on:@@ -90,7 +90,7 @@ services:SETUP_EMAIL_FROM_DEFAULT: admin@${DOMAINNAME}keycloak:- image: openremote/keycloak:${DATE_TAG:-latest}+ image: openremote/keycloak:${KEYCLOAK_VERSION:-12.0.1.0}networks:- public- private@@ -115,7 +115,7 @@ services:KEYCLOAK_FRONTEND_URL: "https://${IDENTITY_NETWORK_HOST:-localhost}/auth"postgresql:- image: openremote/postgresql:${DATE_TAG:-latest}+ image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}networks:- privatehealthcheck: