Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

minor fetch script update

Michal Rutka6b3d74d17c44
diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.yml
index 431cf3f57..18e20b451 100644
--- a/mvp/aws-cloudformation.template.yml
+++ b/mvp/aws-cloudformation.template.yml
@@ -144,9 +144,9 @@ Resources:
docker-compose -f mvp-docker-compose.yml -p openremote up -d
echo USER=${AccessKeys} > access.txt
echo SECRET=${AccessKeys.SecretAccessKey} >> access.txt
- echo EMAIL_PASSWORD=$(or configure_aws --secret ${AccessKeys.SecretAccessKey} --quiet) >> access.txt
- echo EMAIL_USER=$EMAIL_USER >> access.txt
- echo EMAIL_HOST=$EMAIL_HOST >> access.txt
+ echo export EMAIL_PASSWORD=$(or configure_aws --secret ${AccessKeys.SecretAccessKey} --quiet) >> access.txt
+ echo export EMAIL_USER=$EMAIL_USER >> access.txt
+ echo export EMAIL_HOST=$EMAIL_HOST >> access.txt
echo export PASSWORD=${OpenRemotePassword} >> access.txt
mkdir ${HostName}
cd ${HostName}
diff --git a/mvp/fetch_s3_deploy.sh b/mvp/fetch_s3_deploy.sh
index 36fc36951..f6ea09ae9 100755
--- a/mvp/fetch_s3_deploy.sh
+++ b/mvp/fetch_s3_deploy.sh
@@ -9,9 +9,7 @@ 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_NAME openremote/openremote-cli map -a download -f $DEPLOYMENT_NAME -v -t
sudo chown -R ubuntu:ubuntu .
-mv $DEPLOYMENT_NAME/* .
sudo tar -xf deployment.tar.gz
-sudo mv mapdata.mbtiles deployment/map/
-docker-compose -p openremote up -d
-docker images --filter "reference=openremote/*" -q | xargs docker rmi
-rmdir $DEPLOYMENT_NAME
+sudo mv mapdata.mbtiles deployment/map/ || true
+docker-compose -p openremote up -d || exit 69
+docker images --filter "reference=openremote/*" -q | xargs docker rmi || true