diff --git a/scripts/backup_dtr.sh b/scripts/backup_dtr.sh index d5e75de..74ffd8c 100644 --- a/scripts/backup_dtr.sh +++ b/scripts/backup_dtr.sh @@ -5,5 +5,6 @@ export UCP_IPADDR=$(cat /vagrant/ucp-node1-ipaddr) export DTR_IPADDR=$(cat /vagrant/dtr-node1-ipaddr) export SWARM_JOIN_TOKEN_WORKER=$(cat /vagrant/swarm-join-token-worker) export DTR_REPLICA_ID=$(cat /vagrant/dtr-replica-id) +export DTR_VERSION=2.3.3 -docker run --rm docker/dtr:2.3.2 backup --ucp-url https://${UCP_IPADDR} --existing-replica-id ${DTR_REPLICA_ID} --ucp-username admin --ucp-password ${UCP_PASSWORD} --ucp-ca "$(cat ucp-ca.pem)" > /tmp/backup.tar +docker run --rm docker/dtr:${DTR_VERSION} backup --ucp-url https://${UCP_IPADDR} --existing-replica-id ${DTR_REPLICA_ID} --ucp-username admin --ucp-password ${UCP_PASSWORD} --ucp-ca "$(cat ucp-ca.pem)" > /tmp/backup.tar diff --git a/scripts/install_dtr.sh b/scripts/install_dtr.sh index 1785cce..e567be0 100644 --- a/scripts/install_dtr.sh +++ b/scripts/install_dtr.sh @@ -6,7 +6,7 @@ export UCP_IPADDR=$(cat /vagrant/ucp-node1-ipaddr) export UCP_USERNAME=$(cat /vagrant/ucp_username) export UCP_PASSWORD=$(cat /vagrant/ucp_password) export DTR_REPLICA_ID=$(cat /vagrant/dtr-replica-id) -export DTR_VERSION=2.3.0 +export DTR_VERSION=2.3.3 # Sleep 35 seconds to wait for node registration sleep 35 diff --git a/scripts/install_ucp.sh b/scripts/install_ucp.sh index dcfdfb1..01daa8b 100644 --- a/scripts/install_ucp.sh +++ b/scripts/install_ucp.sh @@ -1,5 +1,5 @@ #!/bin/bash -export UCP_VERSION=2.2.2 +export UCP_VERSION=2.2.3 ifconfig enp0s8 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' > /vagrant/ucp-node1-ipaddr export UCP_IPADDR=$(cat /vagrant/ucp-node1-ipaddr) diff --git a/scripts/upgrade_dtr.sh b/scripts/upgrade_dtr.sh index 2ad6c09..81b3453 100644 --- a/scripts/upgrade_dtr.sh +++ b/scripts/upgrade_dtr.sh @@ -1,6 +1,6 @@ #!/bin/bash -export DTR_VERSION=2.3.2 +export DTR_VERSION=2.3.3 export UCP_IPADDR=$(cat /vagrant/ucp-vancouver-node1-ipaddr) export UCP_PASSWORD=$(cat /vagrant/ucp_password) export DTR_REPLICA_ID=$(cat /vagrant/dtr-replica-id) diff --git a/scripts/visualizer.sh b/scripts/visualizer.sh index e715d94..3055448 100644 --- a/scripts/visualizer.sh +++ b/scripts/visualizer.sh @@ -1,8 +1,17 @@ +# HRM Deployment docker service create \ --network ucp-hrm \ --name=viz \ - --publish=8080:8080/tcp \ + --publish=8080 \ --constraint=node.role==manager \ --mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \ --label com.docker.ucp.mesh.http.8080=external_route=http://visualizer.local,internal_port=8080 \ dockersamples/visualizer + +# Non-HRM Deployment +docker service create \ + --name=viz \ + --publish=8080:8080/tcp \ + --constraint=node.role==manager \ + --mount=type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \ + dockersamples/visualizer