From be5a825e7a0afb29fecd21de643d598db10d5e80 Mon Sep 17 00:00:00 2001 From: Justin Ashworth Date: Fri, 11 Jun 2021 11:10:02 -0400 Subject: [PATCH] Updated to v1.0.9 of install script Added ability to choose 7.0.0-beta --- aws/CouchbaseServer/couchbase-amzn-lnx2.template | 3 ++- aws/CouchbaseServer/embedded_server.sh | 4 ++-- .../couchbase-amzn-lnx2.template | 3 ++- aws/CouchbaseServerAndSyncGateway/embedded_gateway.sh | 4 ++-- aws/CouchbaseServerAndSyncGateway/embedded_server.sh | 4 ++-- aws/CouchbaseSyncGateway/embedded_gateway.sh | 4 ++-- script_url.txt | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template index edc7348..f04b3c7 100644 --- a/aws/CouchbaseServer/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServer/couchbase-amzn-lnx2.template @@ -27,7 +27,8 @@ "6.0.3", "6.0.2", "6.0.1", - "6.0.0" + "6.0.0", + "7.0.0-beta" ] }, "InstanceType": { diff --git a/aws/CouchbaseServer/embedded_server.sh b/aws/CouchbaseServer/embedded_server.sh index 132406e..244c473 100644 --- a/aws/CouchbaseServer/embedded_server.sh +++ b/aws/CouchbaseServer/embedded_server.sh @@ -71,9 +71,9 @@ else fi CLUSTER_HOST=$rallyPublicDNS -# https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh gets replaced during build +# __SCRIPT_URL__ gets replaced during build if [[ ! -e "couchbase_installer.sh" ]]; then - curl -L --output "couchbase_installer.sh" "https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh" + curl -L --output "couchbase_installer.sh" "__SCRIPT_URL__" fi bash ./couchbase_installer.sh -ch "$CLUSTER_HOST" -u "$USERNAME" -p "$PASSWORD" -v "$VERSION" -os AMAZON -e AWS -s -c -d diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template index 7fc8e3b..857f662 100644 --- a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template @@ -27,7 +27,8 @@ "6.0.3", "6.0.2", "6.0.1", - "6.0.0" + "6.0.0", + "7.0.0-beta" ] }, "SyncGatewayInstanceCount": { diff --git a/aws/CouchbaseServerAndSyncGateway/embedded_gateway.sh b/aws/CouchbaseServerAndSyncGateway/embedded_gateway.sh index deac48e..a806d80 100644 --- a/aws/CouchbaseServerAndSyncGateway/embedded_gateway.sh +++ b/aws/CouchbaseServerAndSyncGateway/embedded_gateway.sh @@ -32,9 +32,9 @@ aws ec2 create-tags \ CLUSTER_HOST=$(curl -s http://169.254.169.254/latest/meta-data/public-hostname) -# https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh gets replaced during build +# __SCRIPT_URL__ gets replaced during build if [[ ! -e "couchbase_installer.sh" ]]; then - curl -L --output "couchbase_installer.sh" "https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh" + curl -L --output "couchbase_installer.sh" "__SCRIPT_URL__" fi bash ./couchbase_installer.sh -ch "$CLUSTER_HOST" -u "$USERNAME" -p "$PASSWORD" -v "$VERSION" -os AMAZON -e AWS -c -d -g diff --git a/aws/CouchbaseServerAndSyncGateway/embedded_server.sh b/aws/CouchbaseServerAndSyncGateway/embedded_server.sh index bdd3c7e..9e133b5 100644 --- a/aws/CouchbaseServerAndSyncGateway/embedded_server.sh +++ b/aws/CouchbaseServerAndSyncGateway/embedded_server.sh @@ -72,9 +72,9 @@ else fi CLUSTER_HOST=$rallyPublicDNS -# https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh gets replaced during build +# __SCRIPT_URL__ gets replaced during build if [[ ! -e "couchbase_installer.sh" ]]; then - curl -L --output "couchbase_installer.sh" "https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh" + curl -L --output "couchbase_installer.sh" "__SCRIPT_URL__" fi bash ./couchbase_installer.sh -ch "$CLUSTER_HOST" -u "$USERNAME" -p "$PASSWORD" -v "$VERSION" -os AMAZON -e AWS -s -c -d diff --git a/aws/CouchbaseSyncGateway/embedded_gateway.sh b/aws/CouchbaseSyncGateway/embedded_gateway.sh index b907f6b..15c85c9 100644 --- a/aws/CouchbaseSyncGateway/embedded_gateway.sh +++ b/aws/CouchbaseSyncGateway/embedded_gateway.sh @@ -33,9 +33,9 @@ aws ec2 create-tags \ CLUSTER_HOST=$(curl -s http://169.254.169.254/latest/meta-data/public-hostname) -# https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh gets replaced during build +# __SCRIPT_URL__ gets replaced during build if [[ ! -e "couchbase_installer.sh" ]]; then - curl -L --output "couchbase_installer.sh" "https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.7/couchbase_installer.sh" + curl -L --output "couchbase_installer.sh" "__SCRIPT_URL__" fi bash ./couchbase_installer.sh -ch "$CLUSTER_HOST" -u "$USERNAME" -p "$PASSWORD" -v "$VERSION" -os AMAZON -e AWS -c -d -g diff --git a/script_url.txt b/script_url.txt index 9dc50d3..acd609d 100644 --- a/script_url.txt +++ b/script_url.txt @@ -1 +1 @@ -https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.8/couchbase_installer.sh \ No newline at end of file +https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.9/couchbase_installer.sh \ No newline at end of file