aytac/orbiter
1
0
Fork 0
mirror of https://github.com/spaytac/orbiter.git synced 2026-01-21 23:44:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Travis and CI

Browse Source
This commit is contained in:
Gianluca Arbezzano 2017-08-08 22:10:41 +02:00
parent 21d74312cc
commit 487fcfa26f
No known key found for this signature in database
GPG Key ID: 9505D2809E1D6180
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -9,7 +9,7 @@ script:
after_success: after_success:
- docker login -u $DOCKER_USER -p $DOCKER_PASS - docker login -u $DOCKER_USER -p $DOCKER_PASS
- export REPO=gianarb/orbiter - export REPO=gianarb/orbiter
- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker build -f Dockerfile -t $REPO . && docker push $REPO; else echo "I only push from master branch." ; fi - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]; then docker build -f Dockerfile.image -t $REPO . && docker push $REPO; else echo "I only push from master branch." ; fi
env: env:
global: global:
- secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20=" - secure: "MN7hNDnx47U9ZCg78GjEGDH5//lLfVzCKnJyPdT4jpYWM05pDB1rPrNwIPZOVuz4XT/x07Oa5M695Pkt61L+yVVfs+AUN6bYwffKWRU0T1dvXzJneB64JQeIGkqyiAHAmrjlpgzOgfB7EcmH4aEFq1HXYCqrvIgAX75D9l/T3xuRXdIzyVLzD3CZZQSZK5cFT37niofMvHoJgmBg5u8FEd2yR2M2LJGbIpXuB3UOn2yqRZHELVg12zhOwgqE+sQtqzBwirx9GObo5x4Nh7AWHIEN/K4BsxMXwZcWSySb0QxRtPpeyiItdDNr62W2MHpyEy//0sJwC5FFhsBzGfSlLpTV+YPrmaXju81JddQVyaB7l6gR3qnwrEywlLBSU3K71FJTHerq23KQV5p50JKA0oYAkKzDtaj0yJAXpFXZbXQq1cOVQidz7Suhi5ZsobI1bzWb5gELCeqCXr0aweTQXqch7Uom4qhIf6aK961F5dvUubzYcgKqbGRBp2F72rls2+9AvnQwUHnPC574sv88oTj0JrDDZoku4vBqSgNkOOICtekBNnksAZLbWasom/+ksqGyZX8qlbf1LLfhwVLqdFgWXrHggO8r8rh8i9MyON0K04hnTHsPHU8+kmbtzZwbXwnVmrJlWnlpolt5CT5XbaPpPwDxvoYsKx0WoYsmZ20="

3
contrib/swarm/Makefile
View File

@ -2,7 +2,7 @@ IP = $(shell docker-machine ip sw1)
init: init:
./cluster/create.sh ./cluster/create.sh
destroy: destroy:
docker-machine rm -f sw1 sw2 sw3 sw4 docker-machine rm -f sw1 sw2 sw3
deploy: deploy:
docker stack deploy --compose-file stack.yml stack docker stack deploy --compose-file stack.yml stack
ps: ps:
@ -12,4 +12,3 @@ scale-up:
curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/up curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/up
scale-down: scale-down:
curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/down curl -X POST -v http://$(IP):8081/handle/autodetect_swarm/stack_micro/down

6
contrib/swarm/README.md
View File

@ -6,7 +6,7 @@ Requirements:
* Docker Machine * Docker Machine
* Virtualbox * Virtualbox
1. Create a swarm cluster with 4 nodes. One manager and three workers. It uses 1. Create a swarm cluster with 3 nodes. One manager and two workers. It uses
Docker Machine and Virtualbox as provider. Docker Machine and Virtualbox as provider.
``` ```
make init make init
@ -27,7 +27,7 @@ make deploy
4. This command shows the current situation. The first table represent the 4. This command shows the current situation. The first table represent the
number of services and how many task are running under a service. You should number of services and how many task are running under a service. You should
see two services. Micro has 10 tasks. see two services. Micro has 3 tasks.
``` ```
make ps make ps
@ -47,7 +47,7 @@ make scale-down
make ps make ps
``` ```
7. At the end of the test you can clean your envrionment 7. At the end of the test you can clean your environment
``` ```
make destroy make destroy

1
contrib/swarm/cluster/create.sh
View File

@ -5,7 +5,6 @@ echo "### Init Servers ###"
docker-machine create -d ${provider} sw1 & docker-machine create -d ${provider} sw1 &
docker-machine create -d ${provider} sw2 & docker-machine create -d ${provider} sw2 &
docker-machine create -d ${provider} sw3 & docker-machine create -d ${provider} sw3 &
docker-machine create -d ${provider} sw4 &
wait wait

2
contrib/swarm/stack.yml
View File

@ -29,7 +29,7 @@ services:
- 8000:8000 - 8000:8000
deploy: deploy:
mode: replicated mode: replicated
replicas: 10 replicas: 3
labels: [orbiter=true] labels: [orbiter=true]
update_config: update_config:
parallelism: 2 parallelism: 2