Merge pull request appwrite#13 from appwrite/feat-0.11

1351438 · Dec 5, 2021 · aa4305d · aa4305d
2 parents e751a6b + ea71cf2
commit aa4305d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 80 deletions.
diff --git a/appwrite.json b/appwrite.json
@@ -1,7 +1,7 @@
 {
 	"variables": {
 		"token": "{{env `DIGITALOCEAN_TOKEN`}}",
-		"image_name": "appwrite-0.10.4-snapshot-{{timestamp}}"
+		"image_name": "appwrite-0.11.0-snapshot-{{timestamp}}"
 	},
 	"sensitive-variables": [ "token" ],
 	"builders": [

diff --git a/files/var/lib/cloud/scripts/per-instance/01-run-appwrite.sh b/files/var/lib/cloud/scripts/per-instance/01-run-appwrite.sh
@@ -5,4 +5,4 @@ cd /root
 docker run --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
-    appwrite/appwrite:0.10.4 sh -c "install --httpPort=80 --httpsPort=443 --interactive=N"
+    appwrite/appwrite:0.11.0 sh -c "install --httpPort=80 --httpsPort=443 --interactive=N"
diff --git a/scripts/02-setup-appwrite-scripts.sh b/scripts/02-setup-appwrite-scripts.sh
@@ -9,7 +9,7 @@ echo "==============================================="
 echo "=             Pulling docker images             ="
 echo "==============================================="
 
-docker pull appwrite/appwrite:0.10.4
+docker pull appwrite/appwrite:0.11.0
 docker pull traefik:2.5
 docker pull appwrite/mariadb:1.2.0
 docker pull redis:6.0-alpine3.12

diff --git a/scripts/99-image_check.sh b/scripts/99-image_check.sh
@@ -473,81 +473,6 @@ function checkCloudInit {
     fi
     return 1
 }
-function checkMongoDB {
-  # Check if MongoDB is installed
-  # If it is, verify the version is allowed (non-SSPL)
-
-   if [[ $OS == "Ubuntu" ]] || [[ "$OS" =~ Debian.* ]]; then
-
-     if [[ -f "/usr/bin/mongod" ]]; then
-       version=$(/usr/bin/mongod --version --quiet | grep "db version" | sed -e "s/^db\ version\ v//")
-
-      if version_gt $version 4.0.0; then
-        if version_gt $version 4.0.3; then
-          echo -en "\e[41m[FAIL]\e[0m An SSPL version of MongoDB is present, ${version}"
-          ((FAIL++))
-           STATUS=2
-        else
-          echo -en "\e[32m[PASS]\e[0m The version of MongoDB installed, ${version} is not under the SSPL"
-          ((PASS++))
-        fi
-      else
-         if version_gt $version 3.6.8; then
-          echo -en "\e[41m[FAIL]\e[0m An SSPL version of MongoDB is present, ${version}"
-          ((FAIL++))
-           STATUS=2
-        else
-          echo -en "\e[32m[PASS]\e[0m The version of MongoDB installed, ${version} is not under the SSPL"
-          ((PASS++))
-        fi
-      fi
-
-
-     else
-       echo -en "\e[32m[PASS]\e[0m MongoDB is not installed"
-       ((PASS++))
-     fi
-
-   elif [[ $OS == "CentOS Linux" ]] || [[ $OS == "CentOS Stream" ]] || [[ $OS == "Rocky Linux" ]]; then
-
-    if [[ -f "/usr/bin/mongod" ]]; then
-       version=$(/usr/bin/mongod --version --quiet | grep "db version" | sed -e "s/^db\ version\ v//")
-       if version_gt $version 4.0.0; then
-        if version_gt $version 4.0.3; then
-          echo -en "\e[41m[FAIL]\e[0m An SSPL version of MongoDB is present"
-          ((FAIL++))
-           STATUS=2
-        else
-          echo -en "\e[32m[PASS]\e[0m The version of MongoDB installed is not under the SSPL"
-          ((PASS++))
-        fi
-      else
-         if version_gt $version 3.6.8; then
-          echo -en "\e[41m[FAIL]\e[0m An SSPL version of MongoDB is present"
-          ((FAIL++))
-           STATUS=2
-        else
-          echo -en "\e[32m[PASS]\e[0m The version of MongoDB installed is not under the SSPL"
-          ((PASS++))
-        fi
-      fi
-
-
-
-     else
-       echo -en "\e[32m[PASS]\e[0m MongoDB is not installed"
-       ((PASS++))
-     fi
-
-  else
-    echo "ERROR: Unable to identify distribution"
-    ((FAIL++))
-    STATUS 2
-    return 1
-  fi
-
-
-}
 
 function version_gt() { test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"; }
 
@@ -663,8 +588,6 @@ checkRoot
 
 checkAgent
 
-checkMongoDB
-
 
 # Summary
 echo -en "\n\n---------------------------------------------------------------------------------------------------\n"