Skip to content

armgit / core

Public Imported from GitHub
0

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

CI only master branch.

Michal Rutka4d7861a55244
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8e55a07b..956062506 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,12 +11,16 @@ lint-Dockerfile:
- docker pull hadolint/hadolint
- docker run --rm -i hadolint/hadolint < Dockerfile
allow_failure: true
+ only:
+ - master
lint-swarm-Dockerfile:
stage: build
script:
- docker pull hadolint/hadolint
- docker run --rm -i hadolint/hadolint < ./manager/swarm.Dockerfile
+ only:
+ - master
build-master:
stage: build
diff --git a/swarm/swarm-docker-compose.yml b/swarm/swarm-docker-compose.yml
index d7eb007c9..9c2c22335 100644
--- a/swarm/swarm-docker-compose.yml
+++ b/swarm/swarm-docker-compose.yml
@@ -10,7 +10,7 @@
# dosker swarm init
# docker pull openremote/deployment
# docker-compose -p demo up -d --no-build deployment
-# docker stack deploy --compose-file docker-compose-swarm.yml demo
+# docker stack deploy --compose-file swarm-docker-compose.yml demo
#
# Stop the stack:
#