Merge pull request #60 from malscent/main

Updated to v1.0.9 of install script
couchbase-partners · Jun 11, 2021 · 9da4d3e · 9da4d3e
2 parents 0aa7f8e + be5a825
commit 9da4d3e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1 +1 @@
-https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.8/couchbase_installer.sh
+https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.9/couchbase_installer.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.8/couchbase_installer.sh
		https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.9/couchbase_installer.sh