From 148644110b89b444dcfc017b12f114fe68cbd2c2 Mon Sep 17 00:00:00 2001 From: Derek Smith Date: Sat, 5 Nov 2022 19:47:47 -0400 Subject: [PATCH] Registry changes on mgmt. --- cluster.sh | 4 +--- defaults.sh | 1 + deploy.sh | 60 ++++++++++++++++++++++++++--------------------------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/cluster.sh b/cluster.sh index e7e5e20..c1028e2 100755 --- a/cluster.sh +++ b/cluster.sh @@ -35,9 +35,7 @@ if [ ! -f "$CLUSTER_DEFINITION" ]; then export LXD_CLUSTER_PASSWORD="$(gpg --gen-random --armor 1 14)" export SOVEREIGN_STACK_MAC_ADDRESS="CHANGE_ME_REQUIRED" export PROJECT_NAME="public" -export REGISTRY_URL="http://$(hostname).$(resolvectl status | grep 'DNS Domain:' | awk '{ print $3 }'):5000" -export REGISTRY_USERNAME="CHANGE_ME" -export REGISTRY_PASSWORD="CHANGE_ME" +#export REGISTRY_URL="https://index.docker.io/v1/" EOL diff --git a/defaults.sh b/defaults.sh index 0a3442e..3d4e48b 100755 --- a/defaults.sh +++ b/defaults.sh @@ -107,3 +107,4 @@ export REMOTE_CERT_BASE_DIR="$REMOTE_HOME/.certs" # this space is for OS, docker images, etc. DOES NOT INCLUDE USER DATA. export ROOT_DISK_SIZE_GB=20 +export REGISTRY_URL="https://index.docker.io/v1/" diff --git a/deploy.sh b/deploy.sh index eabcfb0..487339a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -164,7 +164,7 @@ if [ ! -f "$CLUSTER_DEFINITION" ]; then echo "ERROR: The cluster defintion could not be found. You may need to re-run 'ss-cluster create'." exit 1 fi - + source "$CLUSTER_DEFINITION" ###########################3 @@ -175,34 +175,34 @@ source "$CLUSTER_DEFINITION" # if the registry URL isn't defined, then we just use the upstream dockerhub. # recommended to run a registry cache on your management machine though. -if [ -n "$REGISTRY_URL" ]; then +# if [ -n "$REGISTRY_URL" ]; then -cat > "$CLUSTER_PATH/registry.yml" < "$CLUSTER_PATH/registry.yml" <