From ed1c5129cce5fbde95f2f168f9967f6a6137f379 Mon Sep 17 00:00:00 2001
From: Tod Burtchell <tod.burtchell@netfoundry.io>
Date: Wed, 30 Mar 2022 09:14:10 -0400
Subject: [PATCH 1/2] Changing from ubuntu 'latest' to 'rolling' tag for
 quickstart base image

---
 quickstart/docker/image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quickstart/docker/image/Dockerfile b/quickstart/docker/image/Dockerfile
index 23e1918d6..33e869769 100644
--- a/quickstart/docker/image/Dockerfile
+++ b/quickstart/docker/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:rolling
 
 RUN apt update && \
     apt install jq curl netcat-openbsd vim inetutils-ping net-tools -y

From f0984d966e38521a7b71509dd2cfc5e7f9f53577 Mon Sep 17 00:00:00 2001
From: Tod Burtchell <tod.burtchell@netfoundry.io>
Date: Wed, 30 Mar 2022 09:15:54 -0400
Subject: [PATCH 2/2] Adding role tag support to quickstart edge routers

---
 quickstart/docker/image/run-router.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh
index 082ca1bc0..bb92f3595 100644
--- a/quickstart/docker/image/run-router.sh
+++ b/quickstart/docker/image/run-router.sh
@@ -10,6 +10,7 @@ if [[ "${ZITI_EDGE_CONTROLLER_RAWNAME-}" == "" ]]; then export export ZITI_EDGE_
 if [[ "${ZITI_EDGE_ROUTER_RAWNAME-}" == "" ]]; then export export ZITI_EDGE_ROUTER_RAWNAME="${ZITI_NETWORK-}-edge-router"; fi
 if [[ "${ZITI_EDGE_ROUTER_PORT-}" == "" ]]; then export ZITI_EDGE_ROUTER_PORT="3022"; fi
 if [[ "${ZITI_EDGE_ROUTER_HOSTNAME}" == "" ]]; then export ZITI_EDGE_ROUTER_HOSTNAME="${ZITI_EDGE_ROUTER_RAWNAME}${ZITI_DOMAIN_SUFFIX}"; fi
+if [[ "${ZITI_EDGE_ROUTER_ROLES}" == "" ]]; then export ZITI_EDGE_ROUTER_ROLES="${ZITI_EDGE_ROUTER_RAWNAME}"; fi
 
 . ${ZITI_HOME}/ziti.env
 
@@ -42,7 +43,7 @@ fi
 
 echo "----------  Creating edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
 "${ZITI_BIN_DIR}/ziti" edge delete edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}"
-"${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t
+"${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}"
 sleep 1
 echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
 "${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt"