Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix AWS host deployment

Michal Rutka3206fabed3ba
diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.yml
index 938799502..431cf3f57 100644
--- a/mvp/aws-cloudformation.template.yml
+++ b/mvp/aws-cloudformation.template.yml
@@ -147,7 +147,7 @@ Resources:
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 PASSWORD=${OpenRemotePassword} >> access.txt
+ echo export PASSWORD=${OpenRemotePassword} >> access.txt
mkdir ${HostName}
cd ${HostName}
wget https://github.com/openremote/openremote/raw/master/mvp/fetch_s3_deploy.sh -O fetch.txt
diff --git a/mvp/fetch_s3_deploy.sh b/mvp/fetch_s3_deploy.sh
index 4eebd35b4..7ba33875a 100755
--- a/mvp/fetch_s3_deploy.sh
+++ b/mvp/fetch_s3_deploy.sh
@@ -1,10 +1,10 @@
-DEPLOYMENT_NAME=${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)
+export DEPLOYMENT_NAME=${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_NAME --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_NAME openremote/openremote-cli map -f $DEPLOYMENT_NAME
echo $AWS_ECR_REPO
-docker-compose down
+docker-compose -p openremote 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_NAME openremote/openremote-cli map -a download -f $DEPLOYMENT_NAME/mapdata.mbtiles -v -t
@@ -12,5 +12,5 @@ docker run --rm -v ~/.aws:/root/.aws -v $(pwd):/$DEPLOYMENT_NAME openremote/open
sudo chown -R ubuntu:ubuntu .
sudo tar -xf deployment.tar.gz
sudo mv mapdata.mbtiles deployment/map/
-docker-compose up -d
-docker images --filter "reference=openremote/openremote-cli" -q | xargs docker rmi
+docker-compose -p openremote up -d
+docker images --filter "reference=openremote/*" -q | xargs docker rmi