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
CI/CD: Minor
Rich Turner235fd4554b4c
diff --git a/.ci_cd/aws/ssh_whitelist.sh b/.ci_cd/aws/ssh_whitelist.shindex 86f20b855..cb127cceb 100644--- a/.ci_cd/aws/ssh_whitelist.sh+++ b/.ci_cd/aws/ssh_whitelist.sh@@ -10,7 +10,7 @@CIDR=$1DESCRIPTION=$2-PROFILE=$3+AWS_PROFILE=$3if [[ $BASH_SOURCE = */* ]]; thenawsDir=${BASH_SOURCE%/*}/@@ -24,8 +24,8 @@ if [ "$AWS_ENABLED" != 'true' ]; thenexit 1fi-if [ -n "$PROFILE" ]; then- PROFILE="--profile $PROFILE"+if [ -n "$AWS_PROFILE" ]; then+ PROFILE="--profile $AWS_PROFILE"fiif [ -n "$CIDR" ]; thendiff --git a/.ci_cd/deploy.sh b/.ci_cd/deploy.shindex ea9754611..3b837e8c1 100644--- a/.ci_cd/deploy.sh+++ b/.ci_cd/deploy.sh@@ -230,8 +230,8 @@ if [ \$? -ne 0 ]; thenfi# Attempt docker compose down-CONTAINER_IDS=$(docker ps -q)-if [ -n "$CONTAINER_IDS" ]; then+CONTAINER_IDS=\$(docker ps -q)+if [ -n "\$CONTAINER_IDS" ]; thenecho "Stopping existing stack"docker-compose -f temp/docker-compose.yml -p or down 2> /dev/null