From 086565fe2e37fb0e99f9a3a93332b48422d318b8 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 20 Oct 2021 15:06:29 +0545 Subject: [PATCH 1/2] update script --- scripts/99-image_check.sh | 77 --------------------------------------- 1 file changed, 77 deletions(-) diff --git a/scripts/99-image_check.sh b/scripts/99-image_check.sh index 6321c2e..24d8710 100644 --- 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" From ea71cf24a852af970a99adbc997953c34fff4903 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Wed, 20 Oct 2021 15:07:06 +0545 Subject: [PATCH 2/2] update appwrite version --- appwrite.json | 2 +- files/var/lib/cloud/scripts/per-instance/01-run-appwrite.sh | 2 +- scripts/02-setup-appwrite-scripts.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appwrite.json b/appwrite.json index 2756dc7..b2ce9a1 100644 --- 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 index dfee553..cb61368 100644 --- 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" \ No newline at end of file + appwrite/appwrite:0.11.0 sh -c "install --httpPort=80 --httpsPort=443 --interactive=N" \ No newline at end of file diff --git a/scripts/02-setup-appwrite-scripts.sh b/scripts/02-setup-appwrite-scripts.sh index 4b5a3cd..d33daad 100644 --- 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