Skip to content

armgit / core

Public Imported from GitHub
0

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

Fix arm root protection problem

Michal Rutka2526ea963562
diff --git a/gitlab-ci/aws-cloudformation.template.arm64.yml b/gitlab-ci/aws-cloudformation.template.arm64.yml
index 872786cc6..6dacf8ab1 100644
--- a/gitlab-ci/aws-cloudformation.template.arm64.yml
+++ b/gitlab-ci/aws-cloudformation.template.arm64.yml
@@ -17,7 +17,7 @@ Parameters:
HostedZone:
Description: Use AWS hosted zone
Type: String
- Default: false
+ Default: true
AllowedValues:
- true
- false
@@ -81,10 +81,10 @@ Resources:
sudo gpasswd -a ubuntu docker
sudo snap install docker
# Prepare deployment files
- mkdir profile
- cd profile
+ cd /home/ubuntu # we need this because on arm docker-compose cannot read /
wget https://github.com/openremote/openremote/raw/master/profile/deploy-no-build.yml
wget https://github.com/openremote/openremote/raw/master/profile/demo-basic-no-build.yml
+ ls -la
if [ ${HostName} ] && [ ${DomainName} ]
then
export DOMAINNAME=${HostName}.${DomainName}
@@ -107,7 +107,7 @@ Resources:
fi
export SETUP_ADMIN_PASSWORD=${OpenRemotePassword}
- docker-compose -f profile/demo-basic-no-build.yml -p openremote up -d
+ docker-compose -f demo-basic-no-build.yml -p openremote up -d
InstanceSecurityGroup:
Type: AWS::EC2::SecurityGroup
Properties:
diff --git a/gitlab-ci/gitlab-ci-submodule.yml b/gitlab-ci/gitlab-ci-submodule.yml
index e45c1f71b..1b78ebb81 100644
--- a/gitlab-ci/gitlab-ci-submodule.yml
+++ b/gitlab-ci/gitlab-ci-submodule.yml
@@ -170,6 +170,7 @@ test-master:
email failed tests:
stage: tests_fail
+ needs: ["test-master"]
<<: *notify_email
rules:
- if: $CI_COMMIT_MESSAGE !~ /skip-test/
@@ -177,6 +178,7 @@ email failed tests:
test FAILED:
stage: tests_fail
+ needs: ["test-master"]
<<: *notify_whatsapp
rules:
- if: $CI_COMMIT_MESSAGE !~ /skip-test/