Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for traefik #48

Merged
merged 3 commits into from
Jun 8, 2016
Merged

Fix for traefik #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca008c
add traefik.enable=false label for all cluster-lab containers
May 26, 2016
558815f
update Version file
May 26, 2016
052638e
I44-DEB-HCODED Fix for hardcoded src deb file version
Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.12
0.2.13
6 changes: 3 additions & 3 deletions package/usr/local/lib/cluster-lab/container_lib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function run_docker_container(){
CLUSTER_NODE_IP="$(get_ip_of_interface "${CLUSTER_INTERFACE}")"

# configure Consul start command
local consul_docker="docker run -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_consul --net host"
local consul_docker="docker run --label traefik.enable=false -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_consul --net host"
local consul_ports="-p ${CLUSTER_NODE_IP}:8400:8400 -p ${CLUSTER_NODE_IP}:8500:8500 -p ${CLUSTER_NODE_IP}:8600:8600 -p ${CLUSTER_NODE_IP}:8301:8301 -p ${CLUSTER_NODE_IP}:8302:8302 ${IMAGE_CONSUL}"

if [[ "$(is_node_cluster_leader)" == "0" ]]; then
Expand All @@ -143,11 +143,11 @@ function run_docker_container(){
sleep 3

# start Swarm-Join container
eval "docker run -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_swarm ${IMAGE_SWARM} join --advertise ${CLUSTER_NODE_IP}:2375 consul://${CLUSTER_NODE_IP}:8500" > /dev/null 2>&1
eval "docker run --label traefik.enable=false -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_swarm ${IMAGE_SWARM} join --advertise ${CLUSTER_NODE_IP}:2375 consul://${CLUSTER_NODE_IP}:8500" > /dev/null 2>&1


# start Swarm-Manage container
eval "docker run -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_swarmmanage -p 2378:2375 ${IMAGE_SWARM} manage --replication --advertise ${CLUSTER_NODE_IP}:2378 consul://${CLUSTER_NODE_IP}:8500" > /dev/null 2>&1
eval "docker run --label traefik.enable=false -dit --restart always --name ${CLUSTER_LAB_CONTAINER_NAMESPACE}_swarmmanage -p 2378:2375 ${IMAGE_SWARM} manage --replication --advertise ${CLUSTER_NODE_IP}:2378 consul://${CLUSTER_NODE_IP}:8500" > /dev/null 2>&1
}

function remove_docker_container(){
Expand Down
4 changes: 3 additions & 1 deletion vagrant/setup_cluster_lab.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ command -v cluster-lab >/dev/null 2>&1
if [[ "$?" -eq 0 ]]; then
cluster-lab stop
fi
dpkg --force-confnew -i ./hypriot-cluster-lab-src_0.1.1-1.deb

cluster_src_deb=`ls ./hypriot-cluster-lab-src_*.deb`
dpkg --force-confnew -i ./$cluster_src_deb

# start Cluster Lab
cluster-lab start